generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc: fix pcm with different chroma luma bit widths(cherry picked from commit 6a444516f338424d062c0ef2806714036283603b)

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mickaël Raulet
2013-10-16 16:03:57 +02:00
committed by Michael Niedermayer
parent b494894390
commit a7e300649a
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/hevc_ps.c
View File

@@ -715,18 +715,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
sps->pcm_enabled_flag = get_bits1(gb);
if (sps->pcm_enabled_flag) {
int pcm_bit_depth_chroma;
sps->pcm.bit_depth = get_bits(gb, 4) + 1;
pcm_bit_depth_chroma = get_bits(gb, 4) + 1;
if (pcm_bit_depth_chroma != sps->pcm.bit_depth) {
av_log(s->avctx, AV_LOG_ERROR,
"PCM Luma bit depth (%d) is different from PCM chroma"\
"bit depth (%d), this is unsupported.\n",
sps->pcm.bit_depth, pcm_bit_depth_chroma);
ret = AVERROR_INVALIDDATA;
goto err;
}
sps->pcm.bit_depth_chroma = get_bits(gb, 4) + 1;
sps->pcm.log2_min_pcm_cb_size = get_ue_golomb_long(gb) + 3;
sps->pcm.log2_max_pcm_cb_size = sps->pcm.log2_min_pcm_cb_size +
get_ue_golomb_long(gb);