diff options
| author | ami_stuff <ami_stuff@o2.pl> | 2012-05-26 00:13:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 00:18:15 +0200 |
| commit | ca8623e1a537fa48366efebdf235442f1197bb71 (patch) | |
| tree | f5eb239b5ba1b24fa771f8b5fe559ddbb61305b4 | |
| parent | c0b47d1914a19abacdf1edf081cbf07485952920 (diff) | |
| download | ffmpeg-ca8623e1a537fa48366efebdf235442f1197bb71.tar.gz | |
Support some BOXX codecs.
Fixes a part of ticket #1352.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/raw.c | 3 | ||||
| -rw-r--r-- | libavformat/isom.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 2a6d7d0129..c084d1465b 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -138,6 +138,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') }, { PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', 'y') }, { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ + { PIX_FMT_UYVY422, MKTAG('b', 'x', 'y', 'v') }, { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, { PIX_FMT_YUYV422, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ @@ -145,8 +146,10 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') }, { PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') }, { PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') }, + { PIX_FMT_BGR24, MKTAG('b', 'x', 'b', 'g') }, { PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') }, { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') }, + { PIX_FMT_RGB24, MKTAG('b', 'x', 'r', 'g') }, { PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') }, { PIX_FMT_GRAY16BE,MKTAG('b', '1', '6', 'g') }, { PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') }, diff --git a/libavformat/isom.c b/libavformat/isom.c index 601be8c739..b0fdb84240 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -83,6 +83,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') }, { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') }, + { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'b', 'g') }, + { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'r', 'g') }, + { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'y', 'v') }, { CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */ { CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */ @@ -92,6 +95,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { CODEC_ID_AVRP, MKTAG('A', 'V', 'r', 'p') }, /* Avid 1:1 10-bit RGB Packer */ { CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ + { CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10BIT 4:2:2 */ { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4 */ { CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4:4 */ { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */ |