second attempt fixing gdkpixbuf stuff

Original commit message from CVS:
second attempt
fixing gdkpixbuf stuff

diff --git a/REQUIREMENTS b/REQUIREMENTS
index 864924e66c7a91e12254e264dae408c2160e8bc7..e0823b1efb8caa240a0958359fb457e277a3329d 100644 (file)
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -65,6 +65,10 @@ raw1394/linux1394    (for the dv plugin)
 libdvdread     (for the dvdsrc)
                        http://www.dtek.chalmers.se/groups/dvd/
                        (optional: libcss for encrypted DVDs)
+libdvdnav      (for the dvdnavsrc)
+                       http://dvd.sourceforge.net/
+                       (optional: libcss for encrypted DVDs)
+               >= 0.1.9
 libesound      (for the esd sink 
                        ftp.gnome.org/pub/GNOME/stable/sources/esound)
 gnome-vfs      (for the gnome-vfs src)

diff --git a/configure.ac b/configure.ac
index 2a549229bcf52ee4dc25b74d42334e51bcca5ef8..3f7347e0f1717c699412cb6ddb6cf15f4b7417ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,18 @@ dnl Check for essential libraries first:
 dnl ====================================
 
 GST_GLIB2_CHECK()
-PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
+
+dnl GTK
+HAVE_GTK=NO
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)
+if test "x$HAVE_GTK_22" = "xyes"; then
+  HAVE_GTK=yes
+else
+  PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
+fi
+if test "x$HAVE_GTK_20" = "xyes"; then
+  HAVE_GTK=yes
+fi
 GTK_CFLAGS=$GTK2_CFLAGS
 GTK_LIBS=$GTK2_LIBS
 AC_SUBST(GTK_LIBS)
@@ -684,7 +695,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
 dnl *** GDK pixbuf ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
 GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
-  if test $HAVE_GTK = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
+  if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
 ])
 
 dnl *** Gnome VFS ***

diff --git a/tools/gst-launch-ext b/tools/gst-launch-ext
index 4108deedaf184ba8e6c8b103b2b0aa8f058b6e5d..61cc656af6618464a9cde7086deba49c34433967 100755 (executable)
--- a/tools/gst-launch-ext
+++ b/tools/gst-launch-ext
@@ -103,7 +103,7 @@ read_config ($0);
 %pipes = ( 
   "ac3", "a52dec ! $cfg{AUDIOSINK}",
   "au", "auparse ! $cfg{AUDIOSINK}",
-  "avi", "avidemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
+  "avi", "avidemux name=demux ! { queue ! jpegdec ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
   "asf", "asfdemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }",
   "flac", "flacdec ! $cfg{AUDIOSINK}",
   "fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}",