Michael Niedermayer dfe5a9f022 Merge commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
* commit 'c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
  lavc: Add DSS SP decoder

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:31:26 +01:00
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-02-19 11:30:30 +01:00
2015-02-14 20:48:50 +01:00
2014-12-01 00:31:06 +01:00
2015-02-02 05:04:14 +01:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2012-12-21 00:18:34 +01:00
2013-02-14 23:45:48 +01:00
2015-02-02 05:04:14 +01:00
2014-07-17 11:29:01 +02:00