# HG changeset patch # User cehoyos # Date 1325187778 0 # Node ID cd6376c5cc943e4e2353c287c9b53c98c0d6575c # Parent 475b95b38f5975f34014671f4c641c9d4de30da2 Support FFmpeg SMJPEG IMA ADPCM decoding. Patch by Paul B Mahol, onemda gmail diff -r 475b95b38f59 -r cd6376c5cc94 etc/codecs.conf --- a/etc/codecs.conf Thu Dec 29 16:11:58 2011 +0000 +++ b/etc/codecs.conf Thu Dec 29 19:42:58 2011 +0000 @@ -4283,6 +4283,13 @@ driver ffmpeg dll adpcm_ima_amv +audiocodec ffadpcmimasmjpeg + info "FFmpeg SMJPEG IMA ADPCM audio" + status working + fourcc APCM + driver ffmpeg + dll adpcm_ima_smjpeg + audiocodec ffadpcmimaqt info "FFmpeg QT IMA ADPCM audio" status working