No longer depend on FFmpeg

diff --git a/Makefile b/Makefile
index 2072cca7ea1f9a707ff8b8d43fbd29db3758516a..6d44917ffeaac17911e2863631ab5c57045a9566 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -167,21 +167,17 @@ CFLAGS_com += -DHTS_VERSION=\"$(VERSION)\"
 
 all: ${PROG}
 
-.PHONY:        clean distclean ffmpeg
+.PHONY:        clean distclean
 
-${PROG}: ${BUILDDIR}/ffmpeg/install $(OBJDIRS) $(OBJS) $(BUNDLE_OBJS) ${OBJS_EXTRA} Makefile
+${PROG}: $(OBJDIRS) $(OBJS) $(BUNDLE_OBJS) ${OBJS_EXTRA} Makefile
        $(CC) -o $@ $(OBJS) $(BUNDLE_OBJS) $(LDFLAGS) ${LDFLAGS_cfg}
 
 $(OBJDIRS):
        @mkdir -p $@
 
-${BUILDDIR}/%.o: %.c  ${BUILDDIR}/ffmpeg/install
+${BUILDDIR}/%.o: %.c
        $(CC) -MD $(CFLAGS_com) $(CFLAGS) $(CFLAGS_cfg) -c -o $@ $(CURDIR)/$<
 
-${BUILDDIR}/ffmpeg/install ffmpeg:
-       cd ${BUILDDIR}/ffmpeg/build && ${MAKE} all
-       cd ${BUILDDIR}/ffmpeg/build && ${MAKE} install
-
 ${BUILDDIR}/%.so: ${SRCS_EXTRA}
        ${CC} -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o $@ $< -ldl
 

diff --git a/configure b/configure
index e9ae17ce69dc04778e7555d89486867a1b91bb99..6b1995020314612e25523162251014e0c0d24f5b 100755 (executable)
--- a/configure
+++ b/configure
@@ -90,7 +90,6 @@ EOF
 
 if [ "x$CC" != "x" ]; then
     echo >${CONFIG_MAK} "CC=$CC"
-    CC_FFMPEG="--cc=$CC"
 else
     CC=cc
 fi
@@ -128,11 +127,6 @@ if enabled avahi; then
     fi
 fi
 
-#
-# configure ffmpeg
-#
-setup_ffmpeg --cpu=${CPU}
-
 #
 # Configure paths, etc
 #

diff --git a/support/configure.inc b/support/configure.inc
index 93b22074d995815e0d30c1089a660fc7f52521c2..d93c38507a41a5453859ad1dd3a01fa1fbecd3b1 100644 (file)
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -122,49 +122,6 @@ EOF
 
 }
 
-
-setup_ffmpeg() {
-    echo "Configuring FFmpeg"
-    mkdir -p ${BUILDDIR}/ffmpeg/build
-    rm -rf ${BUILDDIR}/ffmpeg/install
-
-    (cd ${BUILDDIR}/ffmpeg/build && \
-       ${TOPDIR}/ext/ffmpeg/configure  \
-       $CC_FFMPEG \
-       --disable-encoders \
-       --enable-encoder=mp2 \
-       --enable-encoder=mpeg2video \
-       --disable-muxers \
-       --enable-muxer=matroska \
-       --disable-decoders \
-       --enable-decoder=mp2 \
-       --enable-decoder=mp3 \
-       --enable-decoder=mpeg2video \
-       --enable-decoder=h264 \
-       --enable-decoder=ac3 \
-       --disable-demuxers \
-       --disable-filters \
-       --disable-devices \
-       --disable-stripping \
-       --enable-static \
-       --disable-shared \
-       --enable-pthreads \
-       --prefix=${BUILDDIR}/ffmpeg/install \
-       --disable-ffserver \
-       --disable-ffmpeg \
-       --disable-ffplay \
-       $@
-       )
-
-cat >> ${CONFIG_MAK} << EOF 
-CFLAGS_cfg  += -I${BUILDDIR}/ffmpeg/install/include
-LDFLAGS_cfg += -L${BUILDDIR}/ffmpeg/install/lib
-LDFLAGS_cfg += -lavformat -lavcodec -lavutil
-EOF
-}
-
-
-
 finalize() {
 
 if [ ${RELEASE} = yes ]; then