On Tue, Apr 11, 2017 at 3:29 PM, Anton Khirnov <[email protected]> wrote: > Quoting Steve Lhomme (2017-04-07 14:27:39) >> From: Hendrik Leppkes <[email protected]> >> >> Fixes ticket #4185. >> >> Reviewed-By: Mickael Raulet <[email protected]> >> Signed-off-by: Hendrik Leppkes <[email protected]> >> --- >> libavcodec/hevcdec.c | 3 +++ >> libavcodec/hevcdec.h | 1 + >> 2 files changed, 4 insertions(+) >> >> diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c >> index 6a04858587..6fe05d1b01 100644 >> --- a/libavcodec/hevcdec.c >> +++ b/libavcodec/hevcdec.c >> @@ -2421,6 +2421,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); >> + >> if (s->ps.pps->tiles_enabled_flag) >> lc->end_of_tiles_x = s->ps.pps->column_width[0] << >> s->ps.sps->log2_ctb_size; >> >> @@ -3007,6 +3009,7 @@ static int hevc_update_thread_context(AVCodecContext >> *dst, >> s->seq_output = s0->seq_output; >> s->pocTid0 = s0->pocTid0; >> s->max_ra = s0->max_ra; >> + s->no_rasl_output_flag = s0->no_rasl_output_flag; >> >> s->is_nalff = s0->is_nalff; >> s->nal_length_size = s0->nal_length_size; >> diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h >> index ff192f67ae..64089bde75 100644 >> --- a/libavcodec/hevcdec.h >> +++ b/libavcodec/hevcdec.h >> @@ -484,6 +484,7 @@ typedef struct HEVCContext { >> int bs_height; >> >> int is_decoded; >> + int no_rasl_output_flag; >> >> HEVCPredContext hpc; >> HEVCDSPContext hevcdsp; >> -- >> 2.11.1 > > Eh? This seems to be write-only. >
For some reason he skipped one of the hunks (and also modified the actual setting of the flag?) http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=0118158efa8e45761f9f65a3bb74f33907bd2aec Also, a follow up for tsan happyness: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=bddabfaab65808e40605181d579ffcd85bfe4c26 - Hendrik _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
