diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 00:52:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 00:54:15 +0100 |
| commit | 9567162237d2ac24d0866196534166fc7fc976ef (patch) | |
| tree | 0af53f285a9868acbd183910b6ed5d8132a01d53 /libavcodec/hevc_ps.c | |
| parent | 3cd36b07dd676fb16dba5f39c2ac397740e2d68f (diff) | |
| parent | 78d0b7f36e39bb4745613e312024ddd508e2f0fb (diff) | |
| download | ffmpeg-9567162237d2ac24d0866196534166fc7fc976ef.tar.gz | |
Merge commit '78d0b7f36e39bb4745613e312024ddd508e2f0fb'
* commit '78d0b7f36e39bb4745613e312024ddd508e2f0fb':
hevc: warn when an unknown profile is used
See: a21839149cddf2fa6d4cfc37d066cdb68a2ac8aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index ade014fce9..69500279be 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -201,13 +201,14 @@ 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) + if (ptl->profile_idc == FF_PROFILE_HEVC_MAIN) av_log(s->avctx, AV_LOG_DEBUG, "Main profile bitstream\n"); - else if (ptl->profile_idc == 2) - av_log(s->avctx, AV_LOG_DEBUG, "Main10 profile bitstream\n"); + else if (ptl->profile_idc == FF_PROFILE_HEVC_MAIN_10) + av_log(s->avctx, AV_LOG_DEBUG, "Main 10 profile bitstream\n"); + else if (ptl->profile_idc == FF_PROFILE_HEVC_MAIN_STILL_PICTURE) + av_log(s->avctx, AV_LOG_DEBUG, "Main Still Picture profile bitstream\n"); else - av_log(s->avctx, AV_LOG_WARNING, "No profile indication! (%d)\n", ptl->profile_idc); + av_log(s->avctx, AV_LOG_WARNING, "Unknown HEVC profile: %d\n", ptl->profile_idc); for (i = 0; i < 32; i++) ptl->profile_compatibility_flag[i] = get_bits1(gb); |