mirror of https://github.com/FFmpeg/FFmpeg.git
* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
tiff: Support rgba encoding
Conflicts:
libavcodec/tiffenc.c
See: d7fc100694
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/293/head
commit
1c79ca272d