diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-25 01:39:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-25 01:39:19 +0100 |
| commit | 4b84a69ebb353409cb17b0df02812dfa5c34b150 (patch) | |
| tree | 1575c12cd4fca8da40fd59d9719a54505e91956b /libavcodec/lpc.c | |
| parent | 2d0d1f7eb3f74449063a4e9f770714f94920b720 (diff) | |
| parent | 28e1eed3c2e7e944f1d73dc749076943aeb4c13c (diff) | |
| download | ffmpeg-4b84a69ebb353409cb17b0df02812dfa5c34b150.tar.gz | |
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>
Diffstat (limited to 'libavcodec/lpc.c')
0 files changed, 0 insertions, 0 deletions