aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-12-17 18:56:56 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-12-17 18:56:56 +0000
commit4aaab0a328b671f91a6cd195ef98f0d5592c5e4a (patch)
tree97e6719e083406318fe849456a023b4ea25ed622 /libavformat
parenta3d995c1eb98e38186bf9ed677809c442a7dab35 (diff)
downloadffmpeg-4aaab0a328b671f91a6cd195ef98f0d5592c5e4a.tar.gz
Add decoder for R210 (uncompressed 10-bit RGB) codec.
Originally committed as revision 20891 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 714b6ebc7d..f21cc5fbd5 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -67,6 +67,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
{ CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */
+ { 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_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
diff --git a/libavformat/riff.c b/libavformat/riff.c
index e1d0b2e085..8dfc7d3f39 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -163,6 +163,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('H', 'D', 'Y', 'C') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
{ CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') },
+ { CODEC_ID_R210, MKTAG('r', '2', '1', '0') },
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },