diff options
| author | Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> | 2011-05-23 23:13:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-24 01:31:53 +0200 |
| commit | 83654c7b1b598add9041c7add6b77478eb91177f (patch) | |
| tree | 6ff6f149763c3240ec01e4d53c8c016b9df5af80 /libavformat | |
| parent | 4c509fe305bc79a913ef1b690df6c910c732f608 (diff) | |
| download | ffmpeg-83654c7b1b598add9041c7add6b77478eb91177f.tar.gz | |
Add Kamil Nowosads j2k code.
This needs work but it should not rot in soc svn.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/img2.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 58b0780a3a..e0d9293aea 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -77,6 +77,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_SUNRAST , "sunras"}, { CODEC_ID_JPEG2000 , "j2k"}, { CODEC_ID_JPEG2000 , "jp2"}, + { CODEC_ID_JPEG2000 , "jpc"}, { CODEC_ID_DPX , "dpx"}, { CODEC_ID_PICTOR , "pic"}, { CODEC_ID_NONE , NULL} diff --git a/libavformat/riff.c b/libavformat/riff.c index 833a6bf9e8..4b3ab60bb7 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', ' ') }, |