[FFmpeg-cvslog] Merge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1
Michael Niedermayer
git at videolan.org
Sun May 4 23:33:26 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 4 22:49:00 2014 +0200| [514917bf1cf48965b276aac0ddb2207b50263977] | committer: Michael Niedermayer
Merge commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d' into release/1.1
* commit '3938b6762132d3d7ef1b5782e7dc8bf73ac8145d':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=514917bf1cf48965b276aac0ddb2207b50263977
---
More information about the ffmpeg-cvslog
mailing list