[FFmpeg-cvslog] avconv: remove a pointless check.

Anton Khirnov git at videolan.org
Fri Mar 16 01:48:30 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Mar 14 07:50:30 2012 +0100| [2636e691ce5347756a2c05b3105b0277c1b9acb4] | committer: Anton Khirnov

avconv: remove a pointless check.

output_video_filter is always guaranteed to be set and is in fact
dereferenced right above the check.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2636e691ce5347756a2c05b3105b0277c1b9acb4
---

 avconv.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/avconv.c b/avconv.c
index aebb510..76f73db 100644
--- 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)



More information about the ffmpeg-cvslog mailing list