Merge commit '250e077ee9eec0176a6d54a78542dc792943e71a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 19:35:16 +0000 (20:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 19:37:49 +0000 (20:37 +0100)
commit3cfe1d9b3e656aed8ad89d971fc98693a2f3a983
treea30f3fcc46e2ef9e8de855a99f59967c4eb2c153
parent82a60de3b78f527cca80d4ccf6b62c6d6b8f628b
parent250e077ee9eec0176a6d54a78542dc792943e71a
Merge commit '250e077ee9eec0176a6d54a78542dc792943e71a'

* commit '250e077ee9eec0176a6d54a78542dc792943e71a':
  riff: Support decoding png in avi (ImageJ)

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