summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-05-31 20:17:58 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-05-31 20:17:58 +0000
commit851218584e0d19ddd0a931101e2c9f65aacc7e59 (patch)
tree9e87c570a6390fc131984622720f4bc566aac5d1 /ffmpeg.c
parent24dd21fa4179c31385d1815cb824f66b5038b20c (diff)
Remove useless if(), leftover from the vhook removal.
Originally committed as revision 19070 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 7ee0fbfb15..f7acc7029c 100644
--- 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);
- 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(AVInputStream *ist, AVPicture *picture, void
buf = NULL;
picture2 = picture;
}
- } else {
- av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height);
- }
} else {
picture2 = picture;
}