Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 05:00:25 +0000 (06:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 05:11:32 +0000 (06:11 +0100)
commit3779973a9b8e473718cbd8490f277e589b27a9f6
tree38ebef0b56b2d912da32e6f8f64f1828bdf31df5
parent27513846f66bfaf4dd38b819b71c4786075ee5d1
parentf86f39cb9b1fcd063d5e4812132a75c06cc7acd2
Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'

* commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
  tiff: support decoding GBRP and GBRAP formats

Conflicts:
libavcodec/tiff.c

See: 379ad9788b80e05c0379adc49b26704dfd27d564
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiff.c