Merge commit '599fe93a840397f551d94db406d0bad42b46b94b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:28:39 +0000 (14:28 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:28:39 +0000 (14:28 +0200)
* commit '599fe93a840397f551d94db406d0bad42b46b94b':
  riff: Add AVj2 fourcc for Avid jpeg2000

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/riff.c

Simple merge