1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66'

* commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
  hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-04 21:43:07 +01:00
commit 2865c1b905

View File

@ -457,6 +457,8 @@ static void decode_vui(HEVCContext *s, HEVCSPS *sps)
vui->video_format = get_bits(gb, 3); vui->video_format = get_bits(gb, 3);
vui->video_full_range_flag = get_bits1(gb); vui->video_full_range_flag = get_bits1(gb);
vui->colour_description_present_flag = get_bits1(gb); vui->colour_description_present_flag = get_bits1(gb);
if (vui->video_full_range_flag && sps->pix_fmt == AV_PIX_FMT_YUV420P)
sps->pix_fmt = AV_PIX_FMT_YUVJ420P;
if (vui->colour_description_present_flag) { if (vui->colour_description_present_flag) {
vui->colour_primaries = get_bits(gb, 8); vui->colour_primaries = get_bits(gb, 8);
vui->transfer_characteristic = get_bits(gb, 8); vui->transfer_characteristic = get_bits(gb, 8);