move ffmpeg stuff to gst-ffmpeg module

Original commit message from CVS:
move ffmpeg stuff to gst-ffmpeg module

diff --git a/ChangeLog b/ChangeLog
index 9c34ce1..5c17470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * configure.ac:
+       * ext/Makefile.am:
+       * gst-libs/ext/Makefile.am:
+
+2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * configure.ac: use GST_ARCH to detect architecture
 
 2004-02-12  Julien MOUTTE  <julien@moutte.net>

diff --git a/configure.ac b/configure.ac
index 220a849..0989d99 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -876,24 +876,6 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
   AC_SUBST(FLAC_LIBS)
 ])
 
-dnl *** FFMPEG ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
-GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
-  # only slurp in the case where we are in CVS mode;
-  # prerelease and release should get it disted
-  if test "x$GST_PLUGINS_VERSION_NANO" = x1; then
-    AC_MSG_NOTICE(slurping FFmpeg CVS source)
-    AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2003-10-26 10:00 GMT,
-                    HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
-  else
-    AC_MSG_NOTICE(FFmpeg CVS code should be included already)
-    HAVE_FFMPEG=yes
-  fi
-  # we only bother with uninstalled (included) ffmpeg for now
-  AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
-                     [defined if we use uninstalled ffmpeg])
-])
-
 dnl *** GDK pixbuf ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
 GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
@@ -1513,9 +1495,6 @@ AC_SUBST(GST_CFLAGS)
 dnl ###########################
 dnl # Configure external libs #
 dnl ###########################
-if test "x$HAVE_FFMPEG" = xyes; then
-  AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg/ffmpeg)
-fi 
 
 dnl ############################
 dnl # Set up some more defines #
@@ -1656,7 +1635,6 @@ ext/dvdnav/Makefile
 ext/esd/Makefile
 ext/faac/Makefile
 ext/faad/Makefile
-ext/ffmpeg/Makefile
 ext/flac/Makefile
 ext/gdk_pixbuf/Makefile
 ext/gnomevfs/Makefile
@@ -1717,7 +1695,6 @@ gst-libs/gst/video/Makefile
 gst-libs/gst/xoverlay/Makefile
 gst-libs/gst/xwindowlistener/Makefile
 gst-libs/ext/Makefile
-gst-libs/ext/ffmpeg/Makefile
 examples/dynparams/Makefile
 examples/capsfilter/Makefile
 examples/seeking/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 182ac56..8bb401d 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -94,12 +94,6 @@ endif
 ## FESTIVAL_DIR=
 ## endif
 
-if USE_FFMPEG
-FFMPEG_DIR=ffmpeg
-else
-FFMPEG_DIR=
-endif
-
 if USE_FLAC
 FLAC_DIR=flac
 else
@@ -337,7 +331,6 @@ SUBDIRS=\
        $(NAS_DIR) \
        $(FAAC_DIR) \
        $(FAAD_DIR) \
-       $(FFMPEG_DIR) \
        $(FLAC_DIR) \
        $(GDK_PIXBUF_DIR) \
        $(GNOMEVFS_DIR) \
@@ -392,7 +385,6 @@ DIST_SUBDIRS=\
        esd \
        faac \
        faad \
-       ffmpeg \
        flac \
        gdk_pixbuf \
        gnomevfs \