FFmpeg/libavcodec
Michael Niedermayer 8f83fb9991 Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'
* commit '60cbd6ad84de0931314030b81df87b69d6196587':
  tiff: support reading gray+alpha at 8 bits

Conflicts:
	libavcodec/tiff.c

See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 22:52:01 +02:00
..
2014-07-16 20:55:24 +02:00
2014-06-15 12:11:46 +02:00
2014-06-15 12:11:46 +02:00
2014-08-03 23:34:35 +02:00
2014-08-03 23:34:35 +02:00
2014-07-16 14:27:45 +02:00
2014-08-01 12:20:01 +02:00
2014-07-28 00:47:28 +02:00
2014-07-21 01:25:33 -07:00
2014-07-18 13:31:19 +02:00
2014-07-12 22:33:27 +02:00
2014-07-10 15:29:54 +02:00
2014-06-18 03:13:37 +02:00
2014-07-16 14:38:42 +02:00
2014-06-18 03:13:37 +02:00
2014-06-18 03:13:36 +02:00
2014-06-18 03:13:36 +02:00