Michael Niedermayer a5b2b22d9a Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'
* commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b':
  txd: Use the TextureDSP module for decoding

Conflicts:
	configure
	libavcodec/s3tc.c
	libavcodec/s3tc.h
	libavcodec/txd.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 21:15:50 +02:00
..
2014-06-05 12:20:44 +02:00
2015-04-12 00:15:58 +02:00
2014-04-19 05:06:06 +02:00
2014-01-15 21:20:47 +01:00
2013-07-29 19:20:27 +02:00
2015-04-02 23:15:57 +02:00
2015-04-23 12:56:31 +02:00
2015-05-07 07:19:49 -04:00
2014-09-02 14:41:13 -07:00