ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 07:17:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'

Browse Source 
* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
  mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-06 01:58:28 +01:00
commit 2951b7fb1d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mpegvideo.c
View File

@ -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;

3
libavcodec/mpegvideo_enc.c
View File

@ -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) {