diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2015-10-17 14:31:58 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-10-17 16:29:20 +0200 |
| commit | 632df1de3095943bb57b52b6582341c6482571f7 (patch) | |
| tree | e900cbac0e9d0b060ee90f4a36f315ec28fb39ba | |
| parent | aec1ea344632e9283f33acdf91d70a750c0caf53 (diff) | |
| download | buildroot-632df1de3095943bb57b52b6582341c6482571f7.tar.gz buildroot-632df1de3095943bb57b52b6582341c6482571f7.zip | |
package/ffmpeg: Add optional dependencies
Disable libcdio and libilbc since they are incompatible with ffmpeg.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index f3619706d9..f28eed8639 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -50,9 +50,11 @@ FFMPEG_CONF_OPTS = \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \ --disable-libopencv \ + --disable-libcdio \ --disable-libdc1394 \ --disable-libfaac \ --disable-libgsm \ + --disable-libilbc \ --disable-libnut \ --disable-libopenjpeg \ --disable-libschroedinger \ @@ -191,6 +193,13 @@ else FFMPEG_CONF_OPTS += --disable-bzlib endif +ifeq ($(BR2_PACKAGE_FDK_AAC)$(BR2_PACKAGE_FFMPEG_NONFREE),yy) +FFMPEG_CONF_OPTS += --enable-libfdk-aac +FFMPEG_DEPENDENCIES += fdk-aac +else +FFMPEG_CONF_OPTS += --disable-libfdk-aac +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) # openssl isn't license compatible with GPL ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) @@ -203,6 +212,20 @@ else FFMPEG_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_LIBDCADEC),y) +FFMPEG_CONF_OPTS += --enable-libdcadec +FFMPEG_DEPENDENCIES += libdcadec +else +FFMPEG_CONF_OPTS += --disable-libdcadec +endif + +ifeq ($(BR2_PACKAGE_LIBOPENH264),y) +FFMPEG_CONF_OPTS += --enable-libopenh264 +FFMPEG_DEPENDENCIES += libopenh264 +else +FFMPEG_CONF_OPTS += --disable-libopenh264 +endif + ifeq ($(BR2_PACKAGE_LIBVORBIS),y) FFMPEG_DEPENDENCIES += libvorbis FFMPEG_CONF_OPTS += \ |
