diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-16 23:13:44 +0400 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-18 05:23:20 +0400 |
| commit | 8b597077ae1b59a29350b96683cd406cfc4f801d (patch) | |
| tree | 3cd211e12af3400ad3c3ab85e1d7a29866266f6d | |
| parent | dcdeeea820e4b27b26ca6d6c5101b97605f50a71 (diff) | |
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)
| -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 38351e59cf..acc4cac07b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -174,7 +174,7 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf, 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); } |