[FFmpeg-cvslog] ffmpeg: fix deinterlace

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 11 02:45:34 2012 +0200| [8616c446060ce454885254fbecbf32f437e0b827] | committer: Michael Niedermayer

ffmpeg: fix deinterlace

Fixes ticket1295

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8616c446060ce454885254fbecbf32f437e0b827
---

 ffmpeg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index b169701..a9c8ad6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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;