diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-30 10:50:20 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-12-05 13:22:55 +0100 |
| commit | bedf952bb80ae26427854dcde56c139ecb87d4a0 (patch) | |
| tree | a23c97cf73ac001b78caaf96122fb90461fc6e1f | |
| parent | 2cab011f0f02fcff8a0629a611bcac2f0459f04a (diff) | |
| download | ffmpeg-bedf952bb80ae26427854dcde56c139ecb87d4a0.tar.gz | |
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index b11484e4cf..74095affb3 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 414be908e5..bacec726f6 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 */ |