virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
Code Issues Releases Activity

avconv: remove pointless checks.

Browse Source 
OutputStream.picref is guaranteed to be non-NULL if
get_filtered_video_frame() succeeds.
This commit is contained in:
Anton Khirnov 2012-03-14 07:56:26 +01:00
parent ce326c1130
commit 251422982b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
avconv.c
View File

@ -2028,9 +2028,8 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
filtered_frame, &ost->picref, filtered_frame, &ost->picref,
&ist_pts_tb)) < 0) &ist_pts_tb)) < 0)
goto fail; goto fail;
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->frame_aspect_ratio)
if (ost->picref->video && !ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
#else #else
filtered_frame = decoded_frame; filtered_frame = decoded_frame;
@ -2042,8 +2041,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
do_video_stats(output_files[ost->file_index].ctx, ost, frame_size); do_video_stats(output_files[ost->file_index].ctx, ost, frame_size);
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
frame_available = ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); frame_available = ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);
if (ost->picref) avfilter_unref_buffer(ost->picref);
avfilter_unref_buffer(ost->picref);
} }
#endif #endif
} }