diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 14:28:39 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 14:28:39 +0200 |
| commit | 80b93f24632379c2ccf6d391cf49278e77675ffb (patch) | |
| tree | e7c43571af780315aa4c378e77491034b1c27b52 | |
| parent | aa15e233c4cf8ac64ec73445675aa72baeae661f (diff) | |
| parent | 599fe93a840397f551d94db406d0bad42b46b94b (diff) | |
| download | ffmpeg-80b93f24632379c2ccf6d391cf49278e77675ffb.tar.gz | |
Merge commit '599fe93a840397f551d94db406d0bad42b46b94b'
* commit '599fe93a840397f551d94db406d0bad42b46b94b':
riff: Add AVj2 fourcc for Avid jpeg2000
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 780fe530db..768b406a1f 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -324,6 +324,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') }, |