Browse Source

hevc: initialize no_rasl_output_flag in hevc_frame_start().

This prevents a race condition in files with multiple slices per frame.
tags/n3.3
Ronald S. Bultje 9 years ago
parent
commit
bddabfaab6
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/hevcdec.c

+ 2
- 2
libavcodec/hevcdec.c View File

@@ -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_cb = 0;
s->HEVClc->tu.cu_qp_offset_cr = 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; return 0;
} }


@@ -2677,6 +2675,8 @@ static int hevc_frame_start(HEVCContext *s)
s->is_decoded = 0; s->is_decoded = 0;
s->first_nal_type = s->nal_unit_type; 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) if (s->ps.pps->tiles_enabled_flag)
lc->end_of_tiles_x = s->ps.pps->column_width[0] << s->ps.sps->log2_ctb_size; lc->end_of_tiles_x = s->ps.pps->column_width[0] << s->ps.sps->log2_ctb_size;




Loading…
Cancel
Save