Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-02-14 02:24:31 +0400
committerClément Bœsch <ubitux@gmail.com>2012-02-14 02:32:39 +0400
commitb986590810fb5f90bc253882fa698bf3b9cf5efa (patch)
tree6f4ef6b0f2335e5308308a47181d31ab4d10f828 /ffmpeg.c
parentc214e986347447b011790fa2b874016bf1d558ae (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.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 2 insertions, 4 deletions
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);