[FFmpeg-cvslog] Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'
Michael Niedermayer
git at videolan.org
Tue Mar 3 21:26:02 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 3 21:16:31 2015 +0100| [0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b] | committer: Michael Niedermayer
Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'
* commit '0af3b65880573aa9b3375362eaab4f84140c7dde':
asf: do not export XMP metadata by default
Conflicts:
libavformat/asfdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b
---
More information about the ffmpeg-cvslog
mailing list