[FFmpeg-cvslog] Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
Michael Niedermayer
git at videolan.org
Fri Nov 29 04:21:57 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 04:00:59 2013 +0100| [97468463a239a6767a9c7ad0ed2f9f03e61f5d1a] | committer: Michael Niedermayer
Merge commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48'
* commit 'aaa44d0299338e3bc90128816c21dbfab06cdb48':
dca: support mixing LFE in dca_downmix.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97468463a239a6767a9c7ad0ed2f9f03e61f5d1a
---
More information about the ffmpeg-cvslog
mailing list