Skip to contentSkip to conversation

ffmpeg: libcdio support through libcdio-paranoia

PATCH New Fabrice Fontaine 2 participants 2 messages Apr 2, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 ffmpeg: libcdio support through libcdio-paranoia

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/ffmpeg/ffmpeg.mk +7 -1
index 5d2f89fb43..71d642cf4c 100644
@@ -49,7 +49,6 @@ FFMPEG_CONF_OPTS = \
 	--disable-frei0r \
 	--disable-libopencore-amrnb \
 	--disable-libopencore-amrwb \
-	--disable-libcdio \
 	--disable-libdc1394 \
 	--disable-libgsm \
 	--disable-libilbc \

@@ -203,6 +202,13 @@ else
 FFMPEG_CONF_OPTS += --disable-libfdk-aac
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBCDIO_PARANOIA),yy)
+FFMPEG_CONF_OPTS += --enable-libcdio
+FFMPEG_DEPENDENCIES += libcdio-paranoia
+else
+FFMPEG_CONF_OPTS += --disable-libcdio
+endif
+
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
 FFMPEG_DEPENDENCIES += gnutls
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH 1/1 ffmpeg: libcdio support through libcdio-paranoia

Hello,

Quoted 4 lines · Fabrice Fontaine
Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com