diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:25:24 +0100 |
| commit | d1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe (patch) | |
| tree | cb34d55aa421569fd67f0819d56b21aeac348075 /libavcodec/h264.c | |
| parent | 3c8085dc4250a98405eb64b3765f4ceb8d177c00 (diff) | |
| parent | f81c37e40fe3236d54da12aef9cdba48ba70ec31 (diff) | |
Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31'
* commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31':
vf_delogo: fix an uninitialized read.
h264: remove obsolete comment.
mpegvideo: remove some unused variables from Picture.
utvideoenc/v410enc: do not set AVFrame.reference.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a3f8db294c..3d759cc4f6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1462,7 +1462,6 @@ static void decode_postinit(H264Context *h, int setup_finished) cur->f.repeat_pict = 1; break; case SEI_PIC_STRUCT_FRAME_DOUBLING: - // Force progressive here, doubling interlaced frame is a bad idea. cur->f.repeat_pict = 2; break; case SEI_PIC_STRUCT_FRAME_TRIPLING: |