avformat/Makefile, configure: fix --avformat-swscale and the removal of the

ffmpeg 'lib' make target.

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1116 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 38bfbec..42180f7 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -37,7 +37,7 @@ all:  $(TARGET)
 
 $(LOCAL_FFMPEG_OBJS):
        if [ $(LOCAL_FFMPEG) ] ; then \
-               $(MAKE) -C ffmpeg lib ; \
+               $(MAKE) -C ffmpeg ffmpeg ; \
        fi
 
 $(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index b00de77..284d10e 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -71,7 +71,7 @@ else
                        enable_gpl="--enable-gpl"
                        if [ "$swscale" != "" ]
                        then
-                                       enable_swscale="--enable-swscaler"
+                                       enable_swscale="--enable-swscale"
                                        echo "SWSCALE=1" >> config.mak
                        fi
                elif [ "$swscale" != "" ]