ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Jan 7
00:48:23 2015 +0100| [c09eeca5468ca03cc5733f08dc6303b4aef2c2c1] | committer:
Michael Niedermayer
Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'
* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4':
libavcodec: Add an OpenH264 encoder wrapper
Conflicts:
Changelog
configure
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c09eeca5468ca03cc5733f08dc6303b4aef2c2c1
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog