Commit e00281b6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '2d18aaa1'

* commit '2d18aaa1':
  hevc: refactor Profile Tier Level
  hevc: don't check for errors in PTL code

Conflicts:
	libavcodec/hevc_ps.c

See: 36658c97
See: dddc9b7a
See: ecb21d24Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2fb9e77a 2d18aaa1
...@@ -201,6 +201,7 @@ static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl) ...@@ -201,6 +201,7 @@ static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl)
ptl->profile_space = get_bits(gb, 2); ptl->profile_space = get_bits(gb, 2);
ptl->tier_flag = get_bits1(gb); ptl->tier_flag = get_bits1(gb);
ptl->profile_idc = get_bits(gb, 5); ptl->profile_idc = get_bits(gb, 5);
if (ptl->profile_idc == 1) if (ptl->profile_idc == 1)
av_log(s->avctx, AV_LOG_DEBUG, "Main profile bitstream\n"); av_log(s->avctx, AV_LOG_DEBUG, "Main profile bitstream\n");
else if (ptl->profile_idc == 2) else if (ptl->profile_idc == 2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment