summaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorKamil Nowosad <k.nowosad@students.mimuw.edu.pl>2011-05-23 23:13:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-24 01:31:53 +0200
commit83654c7b1b598add9041c7add6b77478eb91177f (patch)
tree6ff6f149763c3240ec01e4d53c8c016b9df5af80 /libavformat/riff.c
parent4c509fe305bc79a913ef1b690df6c910c732f608 (diff)
downloadffmpeg-streaming-83654c7b1b598add9041c7add6b77478eb91177f.zip
ffmpeg-streaming-83654c7b1b598add9041c7add6b77478eb91177f.tar.gz
Add Kamil Nowosads j2k code.
This needs work but it should not rot in soc svn.
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 833a6bf..4b3ab60 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -250,6 +250,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
{ CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') },
{ CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') },
+ { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') },
{ CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') },
{ CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') },
{ CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },
OpenPOWER on IntegriCloud