Commit 1c79ca27 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5b1b91cf'

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

Conflicts:
	libavcodec/tiffenc.c

See: d7fc1006Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ba7cdb97 5b1b91cf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment