[FFmpeg-cvslog] Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug  4 22:45:33 2014 +0200| [47080b6d17037fd64b3f3a7f19bbad3cdf2d3dac] | committer: Michael Niedermayer

Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'

* commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab':
  tiff: support reading gray+alpha at 16 bits

Conflicts:
	libavcodec/tiff.c

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

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