Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:51:19 +0000 (22:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:52:01 +0000 (22:52 +0200)
* commit '60cbd6ad84de0931314030b81df87b69d6196587':
  tiff: support reading gray+alpha at 8 bits

Conflicts:
libavcodec/tiff.c

See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/tiff.c

Simple merge