From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Fri, 4 Sep 2015 12:31:04 +0000 (+0200)
Subject: riff: Add AVj2 fourcc for Avid jpeg2000
X-Git-Tag: android-x86-7.1-r1~252^2~2035
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=599fe93a840397f551d94db406d0bad42b46b94b;p=android-x86%2Fexternal-ffmpeg.git

riff: Add AVj2 fourcc for Avid jpeg2000
---

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') },