Merge remote-tracking branch 'jamrial/adpcm'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 11 May 2013 22:35:30 +0000 (00:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 11 May 2013 22:38:39 +0000 (00:38 +0200)
* 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>

Trivial merge