Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Jan 2014 00:33:42 +0000 (01:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Jan 2014 00:33:42 +0000 (01:33 +0100)
commit2d0d1f7eb3f74449063a4e9f770714f94920b720
tree7eb0dfcdf69817eb2739a3c6889c1654cfe729f4
parentcf812d81296735b20dc70a63027c74d8008421b4
parent0e1ad2f591b87e944550c15b54e54f8189743289
Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'

* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
  dxtory: add more compressed and uncompressed modes

Conflicts:
libavcodec/dxtory.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxtory.c