Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 01:13:03 +0000 (03:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 01:13:55 +0000 (03:13 +0200)
commitd8bbb99c51af08c76dd0a66588fecc5c0106844d
tree1ae5c4fe51229b48f476c7452304c1b91bcb4282
parentd0d0913702358c61dfb9c5ac8b141cd203524869
parentb08caa87c35a768ec0abb16b1e99c3a85f1df28e
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>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/nvenc_b.c
libavcodec/nvenc_b.h
libavcodec/nvenc_b_h264.c
libavcodec/nvenc_b_hevc.c
libavcodec/version.h