Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'

Browse Source

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

Conflicts:
	libavcodec/tiffenc.c

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

...

This commit is contained in:

Michael Niedermayer 2014-03-17 15:54:48 +01:00

parent ba7cdb970f 5b1b91cfb8

commit 1c79ca272d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available