]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 01:38:50 +0000 (02:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Mar 2014 01:43:04 +0000 (02:43 +0100)
* commit '1b51b7ba00ed72b6ce4c3bcd6897839caa32478c':
  libopenjpeg: Support rgba64 decoding

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

Trivial merge