diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:43:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 21:43:27 +0100 |
| commit | 2865c1b905f05969fed765c97cb6e749a8e83aa9 (patch) | |
| tree | 37022f0600b9ff8d6d1b74363bea47ba8ab9d029 /libavcodec/hevc_ps.c | |
| parent | b906d0488119f85ba871c8a7f089cdc499ce3500 (diff) | |
| parent | 3ef9b7ab95cc703b67a8b658dca45c80df0aaa66 (diff) | |
| download | ffmpeg-2865c1b905f05969fed765c97cb6e749a8e83aa9.tar.gz | |
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>
Diffstat (limited to 'libavcodec/hevc_ps.c')
| -rw-r--r-- | libavcodec/hevc_ps.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index c6489f7948..7f52671713 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -457,6 +457,8 @@ static void decode_vui(HEVCContext *s, HEVCSPS *sps) vui->video_format = get_bits(gb, 3); vui->video_full_range_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) { vui->colour_primaries = get_bits(gb, 8); vui->transfer_characteristic = get_bits(gb, 8); |