generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avconv: remove a pointless check.

Browse Source 
output_video_filter is always guaranteed to be set and is in fact
dereferenced right above the check.
This commit is contained in:
Anton Khirnov 2012-03-14 07:50:30 +01:00
parent 45fdcc8e2d
commit 2636e691ce
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
avconv.c
View File

@ -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]); frame_available = avfilter_poll_frame(ost->output_video_filter->inputs[0]);
while (frame_available) { while (frame_available) {
AVRational ist_pts_tb; 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) if (ost->picref)
filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q);
if (ost->picref->video && !ost->frame_aspect_ratio) if (ost->picref->video && !ost->frame_aspect_ratio)