Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jul 2015 00:15:54 +0000 (02:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Jul 2015 00:15:54 +0000 (02:15 +0200)
commit60c6959b6bf853d7e4c2728000b89b2f4682278a
tree4c0b82f0d63db9ac2cb99dcf82f75bf449c68d26
parent5985316fba3b886699cc7f237bf10466d113fd08
parent461b45efd04859b2672238bc8a6ecab9e9a14948
Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'

* commit '461b45efd04859b2672238bc8a6ecab9e9a14948':
  lavc: Add nvenc.h to the skipheader

Conflicts:
libavcodec/Makefile

No change as there is no nvenc.h in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>