diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 00:35:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 00:38:39 +0200 |
| commit | cbcc5cbbd82523dd1ec56e578bd9e32a56e6270e (patch) | |
| tree | ddf192ef27fd72e08f99ea9469c67d422f5361ca /README | |
| parent | 9a2153894f2390a6da8d64d0c779ff0fd72d79c2 (diff) | |
| parent | 67fad0d221458d43edb9037c30171d0adb1d609a (diff) | |
| download | ffmpeg-cbcc5cbbd82523dd1ec56e578bd9e32a56e6270e.tar.gz | |
Merge remote-tracking branch 'jamrial/adpcm'
* jamrial/adpcm:
ADPCM IMA Radical decoder
RedSpark demuxer
RSD demuxer
adpcm_thp: Allow the use of extradata for the adpcm table
ADP demuxer
ADPCM DTK decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions