diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-10 10:41:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-10 10:43:43 +0200 |
| commit | 990860736328b1b89ac922aa04bda00980762092 (patch) | |
| tree | ed3ac2b623894ab30b2fbfb620fee3adb8afe321 /libavcodec/utvideodec.c | |
| parent | 42b8296f36378c1cbd4fa7d278696196e1c49e5d (diff) | |
| parent | 252ee3d39b899f5bf11af4b5d6d7f117f622a9d7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideodec: Set colorspace by codec_tag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utvideodec.c')
| -rw-r--r-- | libavcodec/utvideodec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 7615ea18fa..308cb69f7a 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -507,22 +507,24 @@ static av_cold int decode_init(AVCodecContext *avctx) case MKTAG('U', 'L', 'Y', '0'): c->planes = 3; avctx->pix_fmt = AV_PIX_FMT_YUV420P; + avctx->colorspace = AVCOL_SPC_BT470BG; break; case MKTAG('U', 'L', 'Y', '2'): c->planes = 3; avctx->pix_fmt = AV_PIX_FMT_YUV422P; + avctx->colorspace = AVCOL_SPC_BT470BG; break; case MKTAG('U', 'L', 'H', '0'): c->planes = 3; + avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->color_primaries = AVCOL_PRI_BT709; avctx->colorspace = AVCOL_SPC_BT709; - avctx->pix_fmt = AV_PIX_FMT_YUV420P; break; case MKTAG('U', 'L', 'H', '2'): c->planes = 3; + avctx->pix_fmt = AV_PIX_FMT_YUV422P; avctx->color_primaries = AVCOL_PRI_BT709; avctx->colorspace = AVCOL_SPC_BT709; - avctx->pix_fmt = AV_PIX_FMT_YUV422P; break; default: av_log(avctx, AV_LOG_ERROR, "Unknown Ut Video FOURCC provided (%08X)\n", |