breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
13aa82bbbb71c04bdcecf1341be4a23aee271bec
FFmpeg/libavcodec/dxtory.c
Michael Niedermayer 4b84a69ebb 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>
2014-01-25 01:39:19 +01:00

23 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink