diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 03:13:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 03:13:55 +0200 |
| commit | d8bbb99c51af08c76dd0a66588fecc5c0106844d (patch) | |
| tree | 1ae5c4fe51229b48f476c7452304c1b91bcb4282 /libavutil/log.h | |
| parent | d0d0913702358c61dfb9c5ac8b141cd203524869 (diff) | |
| parent | b08caa87c35a768ec0abb16b1e99c3a85f1df28e (diff) | |
| download | ffmpeg-d8bbb99c51af08c76dd0a66588fecc5c0106844d.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.h')
0 files changed, 0 insertions, 0 deletions