diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:37:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:37:34 +0100 |
| commit | b906d0488119f85ba871c8a7f089cdc499ce3500 (patch) | |
| tree | d8b200b88dca39fa41ed156cad4fc8b0fd64f923 /libavcodec/hevc_ps.c | |
| parent | be41f21a3d6deb2714debe42530a28a6f3ee68d5 (diff) | |
| parent | 885ec9242554ad25922258a595ec5e317922a412 (diff) | |
| download | ffmpeg-b906d0488119f85ba871c8a7f089cdc499ce3500.tar.gz | |
Merge commit '885ec9242554ad25922258a595ec5e317922a412'
* commit '885ec9242554ad25922258a595ec5e317922a412':
hevc: Use parsed VUI colorimetry in avcodec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 247e1f76bb..c6489f7948 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -461,6 +461,14 @@ static void decode_vui(HEVCContext *s, HEVCSPS *sps) vui->colour_primaries = get_bits(gb, 8); vui->transfer_characteristic = get_bits(gb, 8); vui->matrix_coeffs = get_bits(gb, 8); + + // Set invalid values to "unspecified" + if (vui->colour_primaries >= AVCOL_PRI_NB) + vui->colour_primaries = AVCOL_PRI_UNSPECIFIED; + if (vui->transfer_characteristic >= AVCOL_TRC_NB) + vui->transfer_characteristic = AVCOL_TRC_UNSPECIFIED; + if (vui->matrix_coeffs >= AVCOL_SPC_NB) + vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED; } } |