diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-16 20:13:44 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-18 02:19:13 +0100 |
| commit | b63dbe2220211fc8e9c0dc230dd024d34e5f3c6f (patch) | |
| tree | dd19b8005b4b829eb0878f5e2c91b80e12207c6e /libavcodec | |
| parent | 5df2dc0f945f8a885e3fb1ea0588d659025a8cc6 (diff) | |
| download | ffmpeg-b63dbe2220211fc8e9c0dc230dd024d34e5f3c6f.tar.gz | |
Do not (re-)set libx264 parameter b_tff if interlaced encoding was not requested.
Reconfiguring can break x264 lossless encoding.
Fixes ticket #2165.
(cherry picked from commit 75c7e4583f4fd727d236a12763a265502fe00988)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d56dfe76fd..9d563c8913 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -171,7 +171,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, frame->pict_type == AV_PICTURE_TYPE_P ? X264_TYPE_P : frame->pict_type == AV_PICTURE_TYPE_B ? X264_TYPE_B : X264_TYPE_AUTO; - if (x4->params.b_tff != frame->top_field_first) { + if (x4->params.b_interlaced && x4->params.b_tff != frame->top_field_first) { x4->params.b_tff = frame->top_field_first; x264_encoder_reconfig(x4->enc, &x4->params); } |