[FFmpeg-cvslog] Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
Michael Niedermayer
git at videolan.org
Sat Apr 12 21:49:12 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 12 21:12:42 2014 +0200| [571d2ffa4745a42c6773dceb542a5674005dc597] | committer: Michael Niedermayer
Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
See: 40176fc3149bc72c1309f93989a57aec2322e626
See: d62bf5d4e73250295c0a652e151498c5b19cbd63
See: various others
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=571d2ffa4745a42c6773dceb542a5674005dc597
---
More information about the ffmpeg-cvslog
mailing list