-
Michael Niedermayer authored
* commit '0e1ad2f5': dxtory: add more compressed and uncompressed modes Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2d0d1f7e
* commit '0e1ad2f5': dxtory: add more compressed and uncompressed modes Conflicts: libavcodec/dxtory.c Merged-by: Michael Niedermayer <michaelni@gmx.at>