diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:58:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 01:58:55 +0100 |
| commit | 2951b7fb1d3be236312e27a6dd6dc1dcfc467841 (patch) | |
| tree | 1ad338427924c6bfd48452d80ccec15f352403da | |
| parent | 16338b4fb961acc9e6a21586987266ff9862545d (diff) | |
| parent | bedf952bb80ae26427854dcde56c139ecb87d4a0 (diff) | |
| download | ffmpeg-2951b7fb1d3be236312e27a6dd6dc1dcfc467841.tar.gz | |
Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'
* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 4594bd1eb3..85e8feb9d1 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -818,9 +818,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 caadf17b39..1f235fc64c 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; } av_cold int ff_dct_encode_init(MpegEncContext *s) { |