diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 15:08:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-04 15:09:02 +0100 |
| commit | 40fc1e2dda7b7695702a0e8669aa9429f88b593b (patch) | |
| tree | f955f0a36e7f8573e98ec47c4b5969994c3a2c87 /libavcodec | |
| parent | cddbe9fa2eb50ffb8424c9ed090840972ff48f3c (diff) | |
| parent | 5de64bb34d68d6c224dca90003172d7a27958825 (diff) | |
| download | ffmpeg-40fc1e2dda7b7695702a0e8669aa9429f88b593b.tar.gz | |
Merge commit '5de64bb34d68d6c224dca90003172d7a27958825'
* commit '5de64bb34d68d6c224dca90003172d7a27958825':
utvideoenc: Add support for the new BT.709 FourCCs for YCbCr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utvideoenc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index f6e4e7e358..ab2cfaaa03 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -83,7 +83,10 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } c->planes = 3; - avctx->codec_tag = MKTAG('U', 'L', 'Y', '0'); + if (avctx->colorspace == AVCOL_SPC_BT709) + avctx->codec_tag = MKTAG('U', 'L', 'H', '0'); + else + avctx->codec_tag = MKTAG('U', 'L', 'Y', '0'); original_format = UTVIDEO_420; break; case AV_PIX_FMT_YUV422P: @@ -93,7 +96,10 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } c->planes = 3; - avctx->codec_tag = MKTAG('U', 'L', 'Y', '2'); + if (avctx->colorspace == AVCOL_SPC_BT709) + avctx->codec_tag = MKTAG('U', 'L', 'H', '2'); + else + avctx->codec_tag = MKTAG('U', 'L', 'Y', '2'); original_format = UTVIDEO_422; break; default: |