diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-03-14 07:56:26 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-03-15 09:01:18 +0100 |
commit | 251422982b885f9d41f0c743887a9ff05bf74cb7 (patch) | |
tree | 018010966701b523f1c0b93095dd68ce52e43c80 /avconv.c | |
parent | ce326c11308c380f30e580cb05e6e210b6344fc7 (diff) | |
download | ffmpeg-251422982b885f9d41f0c743887a9ff05bf74cb7.tar.gz |
avconv: remove pointless checks.
OutputStream.picref is guaranteed to be non-NULL if
get_filtered_video_frame() succeeds.
Diffstat (limited to 'avconv.c')
-rw-r--r-- | avconv.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -2028,9 +2028,8 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int filtered_frame, &ost->picref, &ist_pts_tb)) < 0) goto fail; - 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) + filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); + if (!ost->frame_aspect_ratio) ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; #else 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); #if CONFIG_AVFILTER 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 } |