diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-21 02:46:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-21 03:40:53 +0100 |
| commit | 3be1a4ba9a9d926674b33051d6539fe8d8a4106c (patch) | |
| tree | c92779c80a98d94133dde283a86c4b4547dc16ab /libavcodec/raw.c | |
| parent | 134aaa79f7f1ce1df64afc7d10d2b3de77df7b08 (diff) | |
| parent | 37c0dc626d2f8254ef623d987eb5077f9120755f (diff) | |
| download | ffmpeg-3be1a4ba9a9d926674b33051d6539fe8d8a4106c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: always align height by 32 pixel
raw: add 10bit YUV definitions
nut: support 10bit YUV
mpegvideo_enc: separate declarations and statements
oma: make header compile standalone
vp3: Reorder some functions to fix VP3 build with Theora disabled.
build: fix standalone compilation of ADX encoder
build: fix standalone compilation of ADPCM decoders
build: fix standalone compilation of mpc7/mpc8 decoders
4xm: Use bytestream2 functions to prevent overreads
bytestream: add a new set of bytestream functions with overread checking
mpegts: Suppress invalid timebase warnings on DMB streams.
mpegts: Fix typo in handling sections in the PMT.
vc1dec: Use the right pointer type for the tmp pointer
Conflicts:
libavcodec/4xm.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/raw.c')
| -rw-r--r-- | libavcodec/raw.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index a26dea8146..42469fdf65 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -108,6 +108,12 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_BGR48BE, MKTAG( 48, 'B', 'G', 'R') }, { PIX_FMT_GRAY16LE, MKTAG('Y', '1', 0 , 16 ) }, { PIX_FMT_GRAY16BE, MKTAG(16 , 0 , '1', 'Y') }, + { PIX_FMT_YUV420P10LE, MKTAG('Y', '3', 11 , 10 ) }, + { PIX_FMT_YUV420P10BE, MKTAG(10 , 11 , '3', 'Y') }, + { PIX_FMT_YUV422P10LE, MKTAG('Y', '3', 10 , 10 ) }, + { PIX_FMT_YUV422P10BE, MKTAG(10 , 10 , '3', 'Y') }, + { PIX_FMT_YUV444P10LE, MKTAG('Y', '3', 0 , 10 ) }, + { PIX_FMT_YUV444P10BE, MKTAG(10 , 0 , '3', 'Y') }, { PIX_FMT_YUV420P16LE, MKTAG('Y', '3', 11 , 16 ) }, { PIX_FMT_YUV420P16BE, MKTAG(16 , 11 , '3', 'Y') }, { PIX_FMT_YUV422P16LE, MKTAG('Y', '3', 10 , 16 ) }, |