ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Tue Mar
10 13:37:42 2015 +0100| [94bd5793198e13cca6bc4a73795532df8bc6f62e] | committer:
Michael Niedermayer
Merge commit '473281193bed8dcb3f6954a18d03cf6298d651b3' into release/1.1
* commit '473281193bed8dcb3f6954a18d03cf6298d651b3':
Update Changelog for v9.18
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94bd5793198e13cca6bc4a73795532df8bc6f62e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
