From dafc3856d9c34d85a5c172c66d6a6e8ffa201b03 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 3 Sep 2003 22:20:05 +0000
Subject: [PATCH] 10l
Originally committed as revision 2202 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 82b12c8276..56b884a004 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -428,14 +428,15 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
picture2 = &picture_tmp;
avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
- if (do_deinterlace && avpicture_deinterlace(picture2, picture,
- dec->pix_fmt, dec->width, dec->height) < 0) {
- /* if error, do not deinterlace */
- av_free(buf);
- buf = NULL;
- picture2 = picture;
- }
- else {
+ if (do_deinterlace){
+ if(avpicture_deinterlace(picture2, picture,
+ dec->pix_fmt, dec->width, dec->height) < 0) {
+ /* if error, do not deinterlace */
+ av_free(buf);
+ buf = NULL;
+ picture2 = picture;
+ }
+ } else {
if (img_convert(picture2, dec->pix_fmt, picture,
dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not copy */