OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3332072
)
configure: Don't require nonfree for nvenc
author
Timo Rothenpieler
<timo@rothenpieler.org>
Sat, 23 Apr 2016 16:55:51 +0000
(18:55 +0200)
committer
Timo Rothenpieler
<timo@rothenpieler.org>
Wed, 27 Apr 2016 18:17:33 +0000
(20:17 +0200)
As the nvEncodeApi.h header is now MIT licensed, this can be dropped.
The loaded CUDA and NVENC libraries are part of the nvidia driver, and
thus count as system libraries.
configure
patch
|
blob
|
history
diff --git
a/configure
b/configure
index
ef0b689
..
6bfc48f
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-4964,7
+4964,6
@@
die_license_disabled gpl x11grab
die_license_disabled nonfree cuda
die_license_disabled nonfree libfaac
die_license_disabled nonfree libnpp
-die_license_disabled nonfree nvenc
enabled gpl && die_license_disabled_gpl nonfree libfdk_aac
enabled gpl && die_license_disabled_gpl nonfree openssl