[FFmpeg-cvslog] Merge remote-tracking branch 'jamrial/adpcm'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 00:35:30 2013 +0200| [cbcc5cbbd82523dd1ec56e578bd9e32a56e6270e] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cbcc5cbbd82523dd1ec56e578bd9e32a56e6270e
---