diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-03-14 07:50:30 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-03-15 09:00:49 +0100 |
| commit | 2636e691ce5347756a2c05b3105b0277c1b9acb4 (patch) | |
| tree | 7df9359a3dd62326abb7cc41edf1e82ab740394a /avconv.c | |
| parent | 45fdcc8e2d5ba0b8b2996278a4fffa5a57092c79 (diff) | |
| download | ffmpeg-2636e691ce5347756a2c05b3105b0277c1b9acb4.tar.gz | |
avconv: remove a pointless check.
output_video_filter is always guaranteed to be set and is in fact
dereferenced right above the check.
Diffstat (limited to 'avconv.c')
| -rw-r--r-- | avconv.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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) |