[FFmpeg-cvslog] r19070 - trunk/ffmpeg.c

[ramiro]

Author: ramiro
Date: Sun May 31 22:17:58 2009
New Revision: 19070

Log:
Remove useless if(), leftover from the vhook removal.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun May 31 21:51:21 2009	(r19069)
+++ trunk/ffmpeg.c	Sun May 31 22:17:58 2009	(r19070)
@@ -760,7 +760,6 @@ static void pre_process_video_frame(AVIn
         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 */
@@ -769,9 +768,6 @@ static void pre_process_video_frame(AVIn
                 buf = NULL;
                 picture2 = picture;
             }
-        } else {
-            av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height);
-        }
     } else {
         picture2 = picture;
     }