[FFmpeg-cvslog] Merge commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8'
Michael Niedermayer
git at videolan.org
Mon Feb 2 21:15:55 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 2 20:43:13 2015 +0100| [7b32b35bf5c4b02a959477392dfe8963a33a6436] | committer: Michael Niedermayer
Merge commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8'
* commit '3d5d46233cd81f78138a6d7418d480af04d3f6c8':
opus: Factor out imdct15 into a standalone component
Conflicts:
configure
libavcodec/opus_celt.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b32b35bf5c4b02a959477392dfe8963a33a6436
---
More information about the ffmpeg-cvslog
mailing list