[FFmpeg-cvslog] Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'

Michael Niedermayer git at videolan.org
Mon Aug 4 22:57:45 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 22:51:19 2014 +0200| [8f83fb99912fa834ff2081ca876ca05116aab263] | committer: Michael Niedermayer

Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'

* commit '60cbd6ad84de0931314030b81df87b69d6196587':
  tiff: support reading gray+alpha at 8 bits

Conflicts:
	libavcodec/tiff.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f83fb99912fa834ff2081ca876ca05116aab263
---





More information about the ffmpeg-cvslog mailing list