[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Mar 31 02:55:43 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 02:21:57 2014 +0200| [75621cdf5d7e2ca7f6af5fbabd3ce2ed81d6cb12] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libmp3lame: add ABR support
Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h
See: d3211cfaedcc0abf30e3a40c246237090ad95b6d
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75621cdf5d7e2ca7f6af5fbabd3ce2ed81d6cb12
---
More information about the ffmpeg-cvslog
mailing list