From b986590810fb5f90bc253882fa698bf3b9cf5efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Mon, 13 Feb 2012 23:24:31 +0100 Subject: ffmpeg: remove unneeded ost->picref check. If there ost->picref is NULL, it will likely crash anyway a few lines below by dereferencing it in order to access video attribute. --- ffmpeg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 0cb9ba1d1b..c9ef42e4e7 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2141,10 +2141,8 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int } filtered_frame = ist->filtered_frame; *filtered_frame= *decoded_frame; //for me_threshold - if (ost->picref) { - avfilter_fill_frame_from_video_buffer_ref(filtered_frame, ost->picref); - filtered_frame->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); - } + avfilter_fill_frame_from_video_buffer_ref(filtered_frame, 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) ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; do_video_out(output_files[ost->file_index].ctx, ost, ist, filtered_frame); -- cgit v1.2.3