[FFmpeg-cvslog] Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'
Michael Niedermayer
git at videolan.org
Mon Feb 18 12:34:15 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 18 12:29:31 2013 +0100| [4b7c81c3e059ae08e4aa74222de1762342ef8abf] | committer: Michael Niedermayer
Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'
* commit '870a0c669e536d56c6325d84f65e34c53792398e':
build: The libopencore-amrnb encoder depends on audio_frame_queue
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b7c81c3e059ae08e4aa74222de1762342ef8abf
---
More information about the ffmpeg-cvslog
mailing list