[libav-commits] mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

Anton Khirnov git at libav.org
Thu Dec 5 13:45:52 CET 2013


Module: libav
Branch: master
Commit: bedf952bb80ae26427854dcde56c139ecb87d4a0

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Sat Nov 30 10:50:20 2013 +0100

mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

---

 libavcodec/mpegvideo.c     |    3 ---
 libavcodec/mpegvideo_enc.c |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index b11484e..74095af 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -788,9 +788,6 @@ void ff_MPV_common_defaults(MpegEncContext *s)
 
     s->coded_picture_number  = 0;
     s->picture_number        = 0;
-    s->input_picture_number  = 0;
-
-    s->picture_in_gop_number = 0;
 
     s->f_code                = 1;
     s->b_code                = 1;
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 414be90..bacec72 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -217,6 +217,9 @@ static void MPV_encode_defaults(MpegEncContext *s)
     }
     s->me.mv_penalty = default_mv_penalty;
     s->fcode_tab     = default_fcode_tab;
+
+    s->input_picture_number  = 0;
+    s->picture_in_gop_number = 0;
 }
 
 /* init video encoder */



More information about the libav-commits mailing list