[FFmpeg-cvslog] Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'
Michael Niedermayer
git at videolan.org
Mon Feb 18 13:00:47 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 18 12:55:31 2013 +0100| [82e82fa2e5bb262b3447ee53705f378917e4f6f1] | committer: Michael Niedermayer
Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'
* commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b':
build: make audio_frame_queue a stand-alone component
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82e82fa2e5bb262b3447ee53705f378917e4f6f1
---
More information about the ffmpeg-cvslog
mailing list