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)
commit80b93f24632379c2ccf6d391cf49278e77675ffb
treee7c43571af780315aa4c378e77491034b1c27b52
parentaa15e233c4cf8ac64ec73445675aa72baeae661f
parent599fe93a840397f551d94db406d0bad42b46b94b
Merge commit '599fe93a840397f551d94db406d0bad42b46b94b'

* commit '599fe93a840397f551d94db406d0bad42b46b94b':
  riff: Add AVj2 fourcc for Avid jpeg2000

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