avconv: remove a pointless check.
authorAnton Khirnov <anton@khirnov.net>
Wed, 14 Mar 2012 06:50:30 +0000 (07:50 +0100)
committerAnton Khirnov <anton@khirnov.net>
Thu, 15 Mar 2012 08:00:49 +0000 (09:00 +0100)
output_video_filter is always guaranteed to be set and is in fact
dereferenced right above the check.

avconv.c

index aebb510..76f73db 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -2024,8 +2024,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
         frame_available = avfilter_poll_frame(ost->output_video_filter->inputs[0]);
         while (frame_available) {
             AVRational ist_pts_tb;
-            if (ost->output_video_filter)
-                get_filtered_video_frame(ost->output_video_filter, filtered_frame, &ost->picref, &ist_pts_tb);
+            get_filtered_video_frame(ost->output_video_filter, filtered_frame, &ost->picref, &ist_pts_tb);
             if (ost->picref)
                 filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
             if (ost->picref->video && !ost->frame_aspect_ratio)