aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-09-04 14:31:04 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-09-04 17:51:29 +0200
commit599fe93a840397f551d94db406d0bad42b46b94b (patch)
tree40028e17cb9fd514830c779f39515fc063f936ec /libavformat
parenta7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be (diff)
downloadffmpeg-599fe93a840397f551d94db406d0bad42b46b94b.tar.gz
riff: Add AVj2 fourcc for Avid jpeg2000
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index e1f76b2660..9093b3a449 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -316,6 +316,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'C') },
{ AV_CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'K') },
{ AV_CODEC_ID_JPEG2000, MKTAG('I', 'P', 'J', '2') },
+ { AV_CODEC_ID_JPEG2000, MKTAG('A', 'V', 'j', '2') }, /* Avid jpeg2000 */
{ AV_CODEC_ID_VMNC, MKTAG('V', 'M', 'n', 'c') },
{ AV_CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') },
{ AV_CODEC_ID_PNG, MKTAG('M', 'P', 'N', 'G') },