[FFmpeg-cvslog] Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2
Michael Niedermayer
git at videolan.org
Sun May 4 20:55:12 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 4 20:13:41 2014 +0200| [742f9aa8792827fe8718247045ab64401c42e46e] | committer: Michael Niedermayer
Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2
* commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb':
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=742f9aa8792827fe8718247045ab64401c42e46e
---
More information about the ffmpeg-cvslog
mailing list