diff options
| author | Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> | 2011-05-23 23:13:34 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-21 21:38:59 +0200 |
| commit | a304a833621a793bbf49b796fe1fd11ea1cd54c8 (patch) | |
| tree | b8d4f7be196954e34755b52140a6a278606f3594 | |
| parent | 2ea1ca1714f655a463b941b115e45a1a2f031f7b (diff) | |
| download | ffmpeg-a304a833621a793bbf49b796fe1fd11ea1cd54c8.tar.gz | |
riff/img2: Add JPEG 2000 codec IDs.
| -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 ec37a38845..4eef62371d 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -82,6 +82,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_SUNRAST , "im24"}, { CODEC_ID_SUNRAST , "sunras"}, { 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 b2e8414b5d..817349cb82 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', ' ') }, |