ffmpeg/libavcodec
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: 21a100610977a163fe6480b5cf4c25f34f64b86b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:13:53 +02:00
..
2014-04-01 01:13:09 +02:00
2014-02-17 20:50:33 +01:00
2014-01-09 19:33:07 +01:00
2013-12-15 16:53:32 +01:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-04-01 00:10:15 +02:00
2014-03-22 03:12:18 +01:00
2014-02-07 19:32:16 +00:00
2014-02-06 02:51:19 +01:00
2014-03-25 13:29:05 +01:00
2014-03-26 04:20:52 +01:00
2014-03-31 01:11:16 +02:00
2014-01-02 22:07:09 +01:00
2014-04-01 01:13:09 +02:00
2013-12-31 12:19:59 +01:00
2014-01-10 17:08:04 +01:00
2013-12-31 12:19:59 +01:00
2014-01-31 18:34:14 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-03-16 23:29:51 +01:00
2014-01-04 04:16:46 +01:00
2013-12-10 16:18:51 +01:00
2014-03-16 23:31:29 +01:00
2013-12-22 14:59:31 +01:00
2014-01-27 20:36:42 +01:00
2014-03-29 18:13:15 +01:00
2014-03-27 23:57:51 +01:00
2013-12-22 22:03:47 +01:00
2013-12-22 22:03:47 +01:00