diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2019-06-19 15:43:42 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2019-06-19 15:43:42 +0300 |
| commit | 6359385df5c61848c8b11d5ef73bb3ac23e2d96b (patch) | |
| tree | 7d0890753da6bb9a4939e7b6b8c21d4c12d9bad7 | |
| parent | 8e948f9e148a7ee54c00cbf34e3f3329adf83557 (diff) | |
| download | gst-libav-6359385df5c61848c8b11d5ef73bb3ac23e2d96b.tar.gz | |
avvidenc: Correctly signal interlaced input to ffmpeg when the input caps are interlaced
Regression from 1e4529ced2dadbfed4ac10d639a45dbcb0660129
| -rw-r--r-- | ext/libav/gstavvidenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c index ab44e9d..4dbeea9 100644 --- a/ext/libav/gstavvidenc.c +++ b/ext/libav/gstavvidenc.c @@ -254,6 +254,10 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, /* additional avcodec settings */ gst_ffmpeg_cfg_fill_context (G_OBJECT (ffmpegenc), ffmpegenc->context); + if (GST_VIDEO_INFO_IS_INTERLACED (&state->info)) + ffmpegenc->context->flags |= + AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME; + /* and last but not least the pass; CBR, 2-pass, etc */ ffmpegenc->context->flags |= ffmpegenc->pass; switch (ffmpegenc->pass) { @@ -554,8 +558,7 @@ gst_ffmpegvidenc_send_frame (GstFFMpegVidEnc * ffmpegenc, gst_ffmpegvidenc_add_cc (frame->input_buffer, picture); - if (ffmpegenc->context->flags & (AV_CODEC_FLAG_INTERLACED_DCT | - AV_CODEC_FLAG_INTERLACED_ME)) { + if (GST_VIDEO_INFO_IS_INTERLACED (&ffmpegenc->input_state->info)) { picture->interlaced_frame = TRUE; /* if this is not the case, a filter element should be used to swap fields */ picture->top_field_first = |