[FFmpeg-cvslog] Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 22:28:59 2014 +0100| [4aa48e467b1cce80aa937114c1a8c88bb893c320] | committer: Michael Niedermayer

Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'

* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27def898e7499cf36b65b5debc4f303e7e5b
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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