diff options
author | Clément Bœsch <ubitux@gmail.com> | 2012-02-14 02:24:31 +0400 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2012-02-14 02:32:39 +0400 |
commit | b986590810fb5f90bc253882fa698bf3b9cf5efa (patch) | |
tree | 6f4ef6b0f2335e5308308a47181d31ab4d10f828 | |
parent | c214e986347447b011790fa2b874016bf1d558ae (diff) |
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.
-rw-r--r-- | ffmpeg.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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); |