From bddabfaab65808e40605181d579ffcd85bfe4c26 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 27 Mar 2017 09:56:38 -0400 Subject: hevc: initialize no_rasl_output_flag in hevc_frame_start(). This prevents a race condition in files with multiple slices per frame. --- libavcodec/hevcdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 98ed2a022b..ef21595c44 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -826,8 +826,6 @@ static int hls_slice_header(HEVCContext *s) s->HEVClc->tu.cu_qp_offset_cb = 0; s->HEVClc->tu.cu_qp_offset_cr = 0; - s->no_rasl_output_flag = IS_IDR(s) || IS_BLA(s) || (s->nal_unit_type == HEVC_NAL_CRA_NUT && s->last_eos); - return 0; } @@ -2677,6 +2675,8 @@ static int hevc_frame_start(HEVCContext *s) s->is_decoded = 0; s->first_nal_type = s->nal_unit_type; + s->no_rasl_output_flag = IS_IDR(s) || IS_BLA(s) || (s->nal_unit_type == HEVC_NAL_CRA_NUT && s->last_eos); + if (s->ps.pps->tiles_enabled_flag) lc->end_of_tiles_x = s->ps.pps->column_width[0] << s->ps.sps->log2_ctb_size; -- cgit v1.2.3