aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorZhou Zongyi <zhouzy@os.pku.edu.cn>2010-09-13 22:08:51 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2010-09-13 22:08:51 +0000
commit4383692896499933ab7a4978314067be0edbfdb3 (patch)
tree44cedf179201c18be296c88c50dd4b8ef58c72e7 /libavformat/riff.c
parent527c91e34a0e1b49dbaede9fa1a7cc81ef8a3b0a (diff)
downloadffmpeg-4383692896499933ab7a4978314067be0edbfdb3.tar.gz
Add R10k decoder.
Original patch by Zhou Zongyi, zhouzy A os pku edu cn, resubmitted by James Darnley, james.darnley gmail, changes by me. Originally committed as revision 25115 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 8f2f0a2a99..24d0cce975 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -179,6 +179,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'U', 'V', '9') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
{ CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') },
+ { CODEC_ID_R10K, MKTAG('R', '1', '0', 'k') },
{ CODEC_ID_R210, MKTAG('r', '2', '1', '0') },
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },