mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 00:32:31 +00:00
Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'
* commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8': hevc: refactor Profile Tier Level hevc: don't check for errors in PTL code Conflicts: libavcodec/hevc_ps.c See:36658c978f
See:dddc9b7a8e
See:ecb21d2437
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
e00281b6f5
@ -201,6 +201,7 @@ static void decode_profile_tier_level(HEVCContext *s, PTLCommon *ptl)
|
||||
ptl->profile_space = get_bits(gb, 2);
|
||||
ptl->tier_flag = get_bits1(gb);
|
||||
ptl->profile_idc = get_bits(gb, 5);
|
||||
|
||||
if (ptl->profile_idc == 1)
|
||||
av_log(s->avctx, AV_LOG_DEBUG, "Main profile bitstream\n");
|
||||
else if (ptl->profile_idc == 2)
|
||||
|
Loading…
Reference in New Issue
Block a user