[FFmpeg-cvslog] Merge commit '599fe93a840397f551d94db406d0bad42b46b94b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 14:28:39 2015 +0200| [80b93f24632379c2ccf6d391cf49278e77675ffb] | committer: Hendrik Leppkes

Merge commit '599fe93a840397f551d94db406d0bad42b46b94b'

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

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80b93f24632379c2ccf6d391cf49278e77675ffb
---