diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index d20066fc8..134fffdf2 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -333,6 +333,7 @@ define Package/libffmpeg-audio-dec $(call Package/libffmpeg/Default) TITLE+= (audio) VARIANT:=audio-dec + CONFLICTS:=libffmpeg-full endef define Package/libffmpeg-audio-dec/description @@ -351,6 +352,7 @@ $(call Package/libffmpeg/Default) +PACKAGE_libx264:libx264 \ +!PACKAGE_libx264:fdk-aac VARIANT:=full + PROVIDES:=libffmpeg-mini libffmpeg-audio-dec endef @@ -365,6 +367,7 @@ define Package/libffmpeg-mini $(call Package/libffmpeg/Default) TITLE+= (mini) VARIANT:=mini + CONFLICTS:=libffmpeg-full endef define Package/libffmpeg-mini/description