Commit 60c6959b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '461b45ef'

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

Conflicts:
	libavcodec/Makefile

No change as there is no nvenc.h in FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5985316f 461b45ef
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment