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

Originally committed as revision 19070 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Ramiro Polla 16 years ago
parent 24dd21fa41
commit 851218584e
  1. 4
      ffmpeg.c

@ -760,7 +760,6 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
picture2 = &picture_tmp; picture2 = &picture_tmp;
avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height); avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
if (do_deinterlace){
if(avpicture_deinterlace(picture2, picture, if(avpicture_deinterlace(picture2, picture,
dec->pix_fmt, dec->width, dec->height) < 0) { dec->pix_fmt, dec->width, dec->height) < 0) {
/* if error, do not deinterlace */ /* if error, do not deinterlace */
@ -769,9 +768,6 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
buf = NULL; buf = NULL;
picture2 = picture; picture2 = picture;
} }
} else {
av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height);
}
} else { } else {
picture2 = picture; picture2 = picture;
} }

Loading…
Cancel
Save