Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'

Browse Source

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

...

This commit is contained in:

Michael Niedermayer 2015-07-10 02:15:54 +02:00

parent 5985316fba 461b45efd0

commit 60c6959b6b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available