projects
/
buildroot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e97376a
)
ffmpeg: define license
author
Luca Ceresoli
<luca@lucaceresoli.net>
Thu, 7 Feb 2013 11:02:33 +0000
(11:02 +0000)
committer
Peter Korsgaard
<jacmet@sunsite.dk>
Thu, 2 May 2013 21:52:47 +0000
(23:52 +0200)
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/multimedia/ffmpeg/ffmpeg.mk
patch
|
blob
|
history
diff --git
a/package/multimedia/ffmpeg/ffmpeg.mk
b/package/multimedia/ffmpeg/ffmpeg.mk
index 2e88b6b87e3e3e03f355e82c112ab5d5c4797436..fd7a25677c1c4a6e140aa2618c15c90f2da91453 100644
(file)
--- a/
package/multimedia/ffmpeg/ffmpeg.mk
+++ b/
package/multimedia/ffmpeg/ffmpeg.mk
@@
-9,6
+9,13
@@
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
+FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
+FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
+ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
+FFMPEG_LICENSE += and GPLv2+
+FFMPEG_LICENSE_FILES += COPYING.GPLv2
+endif
+
FFMPEG_CONF_OPT = \
--prefix=/usr \
--disable-avfilter \