diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-03-13 09:33:38 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-03-13 09:33:38 +0100 |
| commit | db4786f1cf03a5ce4841412e5dad03404e5ade7a (patch) | |
| tree | f1e07d38ea20e1f2907d0dab3c3d68e7163df2de /libavcodec | |
| parent | 58cb1fb1fe925c85161f23d5a368f126317cb292 (diff) | |
| download | ffmpeg-db4786f1cf03a5ce4841412e5dad03404e5ade7a.tar.gz | |
lavc/hevc_ps: Support GBR decoding.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc_ps.c | 13 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index bcb63a36d0..a36c6ee149 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -561,6 +561,19 @@ static void decode_vui(GetBitContext *gb, AVCodecContext *avctx, vui->transfer_characteristic = AVCOL_TRC_UNSPECIFIED; if (vui->matrix_coeffs >= AVCOL_SPC_NB) vui->matrix_coeffs = AVCOL_SPC_UNSPECIFIED; + if (vui->matrix_coeffs == AVCOL_SPC_RGB) { + switch (sps->pix_fmt) { + case AV_PIX_FMT_YUV444P: + sps->pix_fmt = AV_PIX_FMT_GBRP; + break; + case AV_PIX_FMT_YUV444P10: + sps->pix_fmt = AV_PIX_FMT_GBRP10; + break; + case AV_PIX_FMT_YUV444P12: + sps->pix_fmt = AV_PIX_FMT_GBRP12; + break; + } + } } } diff --git a/libavcodec/version.h b/libavcodec/version.h index 8153047011..1306bc3352 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 28 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |