| Message ID | 1445085118-8020-1-git-send-email-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
Dear Bernd Kuhls,
On Sat, 17 Oct 2015 14:31:58 +0200, Bernd Kuhls wrote:
> Disable libcdio and libilbc since they are incompatible with ffmpeg.
It isn't really clear what you mean by "they are incompatible with
ffmpeg". Are you talking about the specific version of those libraries
we have in Buildroot?
Nonetheless, I've applied the patch since it's reasonable to explicitly
disable libraries for which we don't have support at the moment.
Thanks,
Thomas
Am Sat, 17 Oct 2015 16:30:18 +0200 schrieb Thomas Petazzoni: > On Sat, 17 Oct 2015 14:31:58 +0200, Bernd Kuhls wrote: >> Disable libcdio and libilbc since they are incompatible with ffmpeg. > > It isn't really clear what you mean by "they are incompatible with > ffmpeg". Are you talking about the specific version of those libraries > we have in Buildroot? > > Nonetheless, I've applied the patch since it's reasonable to explicitly > disable libraries for which we don't have support at the moment. Hi Thomas, detecting libilbc fails with ffconf.DC5UxjIt.c:(.text.startup+0x1b): undefined reference to `WebRtcIlbcfix_InitDecode' This function is not part of our libilbc version. Detecting libcdio fails with /tmp/ffconf.bwyXkIcF.c:1:32: fatal error: cdio/paranoia/cdda.h: No such file or directory #include <cdio/paranoia/cdda.h> According to https://ffmpeg.org/pipermail/ffmpeg-cvslog/2013- January/059617.html we need a seperate cdparanoia package because the headers needed by ffmpeg were split from libcdio. According to https:// bugs.busybox.net/show_bug.cgi?id=7826 there is no cdparanoia package in buildroot. Regards, Bernd
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index febca90..42ccd2e 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_FFMPEG_GNUTLS),y) FFMPEG_CONF_OPTS += --enable-gnutls FFMPEG_DEPENDENCIES += gnutls @@ -205,6 +214,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 += \
Disable libcdio and libilbc since they are incompatible with ffmpeg. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/ffmpeg/ffmpeg.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)