[FFmpeg-cvslog] Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 15:54:48 2014 +0100| [1c79ca272de8a94ef7a7cc4352645a1013cf9be3] | committer: Michael Niedermayer

Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'

* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
  tiff: Support rgba encoding

Conflicts:
	libavcodec/tiffenc.c

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

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