1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  utvideodec: Set colorspace by codec_tag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-10 10:41:57 +02:00
commit 9908607363

View File

@ -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",