ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Jun 1
03:13:03 2015 +0200| [d8bbb99c51af08c76dd0a66588fecc5c0106844d] | committer:
Michael Niedermayer
Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'
* commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e':
nvenc: H264 and HEVC encoders
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/version.h
This implementation is merged under the name nvenc_b*
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8bbb99c51af08c76dd0a66588fecc5c0106844d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
