diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 04:45:34 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 04:45:34 +0400 |
commit | 8616c446060ce454885254fbecbf32f437e0b827 (patch) | |
tree | e3edf94d2c42c2ec5a6c7177f3be2b1dc179c781 /ffmpeg.c | |
parent | 015903294ca983f007ab5cae098a54013e77f2f6 (diff) |
ffmpeg: fix deinterlace
Fixes ticket1295
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2896,7 +2896,7 @@ static int init_input_stream(int ist_index, char *error, int error_len) return AVERROR(EINVAL); } - ist->dr1 = codec->capabilities & CODEC_CAP_DR1; + ist->dr1 = (codec->capabilities & CODEC_CAP_DR1) && !do_deinterlace; if (codec->type == AVMEDIA_TYPE_VIDEO && ist->dr1) { ist->st->codec->get_buffer = codec_get_buffer; ist->st->codec->release_buffer = codec_release_buffer; |