[backfire/packages] openntpd: merge r28620, r28621

[openwrt/svn-archive/archive.git] / multimedia / ffmpeg / Makefile

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 101e7d94d548fd34a971220e75082a28d5110e1f..e2dc1f13a3b5fe7df5b3e8e14a456d1ae9f42cea 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -213,6 +213,8 @@ define Build/Configure
                --disable-debug \
                --enable-gpl \
                --disable-libfaad \
+               --disable-amd3dnow \
+               --disable-amd3dnowext \
                --disable-mmx \
                --disable-mmx2 \
                --enable-pthreads \
@@ -255,6 +257,7 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libav{codec,device,format,util} $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libpostproc $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libswscale $(1)/usr/include/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libav{codec,device,format,util}.{a,so*} $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.{a,so*} $(1)/usr/lib/