Remove useless if(), leftover from the vhook removal.
authorRamiro Polla <ramiro.polla@gmail.com>
Sun, 31 May 2009 20:17:58 +0000 (20:17 +0000)
committerRamiro Polla <ramiro.polla@gmail.com>
Sun, 31 May 2009 20:17:58 +0000 (20:17 +0000)
Originally committed as revision 19070 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 7ee0fbf..f7acc70 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -760,7 +760,6 @@ 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);
 
         picture2 = &picture_tmp;
         avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
 
-        if (do_deinterlace){
             if(avpicture_deinterlace(picture2, picture,
                                      dec->pix_fmt, dec->width, dec->height) < 0) {
                 /* if error, do not deinterlace */
             if(avpicture_deinterlace(picture2, picture,
                                      dec->pix_fmt, dec->width, dec->height) < 0) {
                 /* if error, do not deinterlace */
@@ -769,9 +768,6 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
                 buf = NULL;
                 picture2 = picture;
             }
                 buf = NULL;
                 picture2 = picture;
             }
-        } else {
-            av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height);
-        }
     } else {
         picture2 = picture;
     }
     } else {
         picture2 = picture;
     }