[FFmpeg-cvslog] Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
Michael Niedermayer
git at videolan.org
Mon Mar 31 02:19:51 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 31 02:18:24 2014 +0200| [e4fc7e3d4de96ba16582d2500f377ecdece28401] | committer: Michael Niedermayer
Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
libmp3lame: add comments about CBR/VBR modes
Conflicts:
libavcodec/libmp3lame.c
See: 07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4fc7e3d4de96ba16582d2500f377ecdece28401
---
More information about the ffmpeg-cvslog
mailing list