aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-01-01 12:16:42 +0000
committerMichael Niedermayer <michaelni@gmx.at>2012-01-02 03:35:23 +0100
commitdfa77dead2c97ec84092066102b14a2524d4d88b (patch)
treecdbd2019a900668ac4bb5a2297ff966a25d6bd4c /libavformat
parentb1031562351d81fb56f9338df5876dc2153d9f26 (diff)
downloadffmpeg-dfa77dead2c97ec84092066102b14a2524d4d88b.tar.gz
y41p encoder and decoder
y41p is a packed 12-bit 4:1:1 YUV format used by Brooktree. Fixes issue 1123 / ticket #102. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/isom.c1
-rw-r--r--libavformat/riff.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 0a01e78ed1..7cadcef79e 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -91,6 +91,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
{ CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */
+ { CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */
{ CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
{ CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 4f475ba04d..74f384d268 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -290,6 +290,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') },
{ CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0') },
{ CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
+ { CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') },
{ CODEC_ID_NONE, 0 }
};