ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Sun Dec
21 04:06:49 2014 +0100| [c7b8f02940ecb911fde566a578f3aae2eddf302f] | committer:
Michael Niedermayer
Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1
* commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248':
Update Changelog for v9.17
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7b8f02940ecb911fde566a578f3aae2eddf302f
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
