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

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index b11484e4cf3890981bba8f4723dce5f372a54863..74095affb3ab6e1d18cb14fbb85e5e70da036833 100644 (file)
--- 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 414be908e5b019845770e76ef12f197dda4a3961..bacec726f61de3160a1ef76af4bb8fa91f48179e 100644 (file)
--- 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 */