Michael Niedermayer 4ebfcd62af Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38' ...

* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
  sgi: encode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog
	libavcodec/sgienc.c

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

2014-04-01 04:13:53 +02:00

7.0 KiB

Raw Blame History

View Raw