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)
* 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>

Trivial merge