diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-23 12:55:48 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-23 12:55:48 +0000 |
| commit | 616c26ab2218b26032d7f6d08c41383905424e02 (patch) | |
| tree | b8318ea72141683a478dd6864ec2f01784071446 | |
| parent | ce7b6d9e0faf76047452327396670a895cdf0a94 (diff) | |
| download | gst-plugins-bad-616c26ab2218b26032d7f6d08c41383905424e02.tar.gz gst-plugins-bad-616c26ab2218b26032d7f6d08c41383905424e02.tar.bz2 gst-plugins-bad-616c26ab2218b26032d7f6d08c41383905424e02.zip | |
more cleanups adding avifile
Original commit message from CVS:
more cleanups
adding avifile
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | ext/Makefile.am | 11 | ||||
| -rw-r--r-- | gst/playondemand/filter.func | 3 |
3 files changed, 18 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0bb4b9d2..d6e47e12 100644 --- a/configure.ac +++ b/configure.ac @@ -421,11 +421,14 @@ GST_CHECK_FEATURE(AUDIOFILE, [audiofile], afsink afsrc, [ dnl *** avifile *** dnl this check uses the GST_CHECK_CONFIGPROG macro +dnl this check needs more fixing +dnl translit(dnm, m, l) AC_SUBST(AVIFILE_LIBS) translit(dnm, m, l) AM_CONDITIONAL(USE_AVIFILE, true) GST_CHECK_FEATURE(AVIFILE, [avifile], windec winenc, [ - translit(dnm, m, l) AC_SUBST(AVIFILE_LIBS) translit(dnm, m, l) AC_SUBST(AVIFILE_CFLAGS) GST_CHECK_CONFIGPROG(AVIFILE, avifile-config) + AVIFILE_LIBS="$AVIFILE_LIBS -lstdc++" + AC_SUBST(AVIFILE_LIBS) ]) dnl *** CDParanoia *** @@ -439,7 +442,7 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) dnl *** dvdread *** translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true) -GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdread, [ +GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdsrc, [ GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread") AC_SUBST(DVDREAD_LIBS) ]) @@ -1064,10 +1067,10 @@ gst/volume/Makefile \ gst/vumeter/Makefile \ gst/wavparse/Makefile" +dnl $PLUGIN_GST_MAKEFILES AC_OUTPUT( Makefile gst/Makefile -$PLUGIN_GST_MAKEFILES sys/Makefile sys/oss/Makefile sys/qcam/Makefile @@ -1079,6 +1082,7 @@ ext/Makefile ext/aalib/Makefile ext/alsa/Makefile ext/audiofile/Makefile +ext/avifile/Makefile ext/dvdread/Makefile ext/esd/Makefile ext/lame/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 92ff0db5..3bd9abd3 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -22,6 +22,13 @@ else AUDIOFILE_DIR= endif +if USE_AVIFILE +AVIFILE_DIR=avifile +else +AVIFILE_DIR= +endif + + if USE_DVDREAD DVDREAD_DIR=dvdread else @@ -65,9 +72,9 @@ VORBIS_DIR= endif SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \ - $(DVDREAD_DIR) $(ESD_DIR) \ + $(AVIFILE_DIR) $(DVDREAD_DIR) $(ESD_DIR) \ $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \ $(SDL_DIR) $(VORBIS_DIR) -DIST_SUBDIRS=a52 aalib alsa audiofile dvdread esd \ +DIST_SUBDIRS=a52 aalib alsa avifile audiofile dvdread esd \ lame mad mpeg2dec sdl vorbis diff --git a/gst/playondemand/filter.func b/gst/playondemand/filter.func index 6f81c975..08bc2f97 100644 --- a/gst/playondemand/filter.func +++ b/gst/playondemand/filter.func @@ -116,5 +116,6 @@ do { if (! filter->eos) { in = gst_pad_pull(filter->sinkpad); } + gst_element_yield (GST_ELEMENT (filter)); -} while (! GST_ELEMENT_IS_COTHREAD_STOPPING(elem)); +} while (TRUE); |