[FFmpeg-cvslog] Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
Michael Niedermayer
git at videolan.org
Fri Jan 17 15:54:27 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 15:31:18 2014 +0100| [58770db2ae67d9b4b6adcf2b15951f9608442051] | committer: Michael Niedermayer
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
mp3enc: allow omitting the id3v2 header with -id3v2_version 0
Conflicts:
doc/muxers.texi
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58770db2ae67d9b4b6adcf2b15951f9608442051
---
More information about the ffmpeg-cvslog
mailing list