diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-07-28 11:37:49 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-07-28 11:37:49 +0000 |
| commit | 6c336a9f4b3285ad754868061dcb06f2846be155 (patch) | |
| tree | 5fbf1527d865abef48fafe3d3410d600f153f953 | |
| parent | 61f3c61d925172ea16e5eaacf5d50edf34486ddf (diff) | |
second attempt fixing gdkpixbuf stuff
Original commit message from CVS:
second attempt
fixing gdkpixbuf stuff
| -rw-r--r-- | REQUIREMENTS | 4 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | sys/oss/gstosssink.c | 1 | ||||
| -rwxr-xr-x | tools/gst-launch-ext | 2 |
4 files changed, 18 insertions, 4 deletions
diff --git a/REQUIREMENTS b/REQUIREMENTS index 864924e6..e0823b1e 100644 --- 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 2a549229..3f7347e0 100644 --- 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/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index a881e08b..05a0419d 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -547,7 +547,6 @@ gst_osssink_set_property (GObject *object, guint prop_id, const GValue *value, G gst_osscommon_sync_parms (&osssink->common); break; case ARG_BUFFER_SIZE: - if (osssink->bufsize == g_value_get_int (value)) break; osssink->bufsize = g_value_get_uint (value); osssink->sinkpool = gst_buffer_pool_get_default (osssink->bufsize, 6); g_object_notify (object, "buffer_size"); diff --git a/tools/gst-launch-ext b/tools/gst-launch-ext index 4108deed..61cc656a 100755 --- 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}", |