Merge remote-tracking branch 'qatar/master'
* qatar/master:
dxtory: compressed RGB555/RGB565 decoding support
Conflicts:
libavcodec/dxtory.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment