diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-25 01:33:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-25 01:33:42 +0100 |
| commit | 2d0d1f7eb3f74449063a4e9f770714f94920b720 (patch) | |
| tree | 7eb0dfcdf69817eb2739a3c6889c1654cfe729f4 /libavcodec/pcm_tablegen.h | |
| parent | cf812d81296735b20dc70a63027c74d8008421b4 (diff) | |
| parent | 0e1ad2f591b87e944550c15b54e54f8189743289 (diff) | |
| download | ffmpeg-2d0d1f7eb3f74449063a4e9f770714f94920b720.tar.gz | |
Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'
* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
dxtory: add more compressed and uncompressed modes
Conflicts:
libavcodec/dxtory.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcm_tablegen.h')
0 files changed, 0 insertions, 0 deletions