mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

more cleanups adding avifile

Browse source 
Original commit message from CVS:
more cleanups
adding avifile
This commit is contained in:
Thomas Vander Stichele 2001-12-23 12:55:48 +00:00
parent ce7b6d9e0f
commit 616c26ab22
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -421,11 +421,14 @@ GST_CHECK_FEATURE(AUDIOFILE, [audiofile], afsink afsrc, [
dnl *** avifile *** dnl *** avifile ***
dnl this check uses the GST_CHECK_CONFIGPROG macro 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) translit(dnm, m, l) AM_CONDITIONAL(USE_AVIFILE, true)
GST_CHECK_FEATURE(AVIFILE, [avifile], windec winenc, [ GST_CHECK_FEATURE(AVIFILE, [avifile], windec winenc, [
translit(dnm, m, l) AC_SUBST(AVIFILE_LIBS)
translit(dnm, m, l) AC_SUBST(AVIFILE_CFLAGS) translit(dnm, m, l) AC_SUBST(AVIFILE_CFLAGS)
GST_CHECK_CONFIGPROG(AVIFILE, avifile-config) GST_CHECK_CONFIGPROG(AVIFILE, avifile-config)
AVIFILE_LIBS="$AVIFILE_LIBS -lstdc++"
AC_SUBST(AVIFILE_LIBS)
]) ])
dnl *** CDParanoia *** dnl *** CDParanoia ***
@ -439,7 +442,7 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl *** dvdread *** dnl *** dvdread ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true) 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") GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread")
AC_SUBST(DVDREAD_LIBS) AC_SUBST(DVDREAD_LIBS)
]) ])
@ -1064,10 +1067,10 @@ gst/volume/Makefile \
gst/vumeter/Makefile \ gst/vumeter/Makefile \
gst/wavparse/Makefile" gst/wavparse/Makefile"
dnl $PLUGIN_GST_MAKEFILES
AC_OUTPUT( AC_OUTPUT(
Makefile Makefile
gst/Makefile gst/Makefile
$PLUGIN_GST_MAKEFILES
sys/Makefile sys/Makefile
sys/oss/Makefile sys/oss/Makefile
sys/qcam/Makefile sys/qcam/Makefile
@ -1079,6 +1082,7 @@ ext/Makefile
ext/aalib/Makefile ext/aalib/Makefile
ext/alsa/Makefile ext/alsa/Makefile
ext/audiofile/Makefile ext/audiofile/Makefile
ext/avifile/Makefile
ext/dvdread/Makefile ext/dvdread/Makefile
ext/esd/Makefile ext/esd/Makefile
ext/lame/Makefile ext/lame/Makefile

11
ext/Makefile.am
View file

@ -22,6 +22,13 @@ else
AUDIOFILE_DIR= AUDIOFILE_DIR=
endif endif
if USE_AVIFILE
AVIFILE_DIR=avifile
else
AVIFILE_DIR=
endif
if USE_DVDREAD if USE_DVDREAD
DVDREAD_DIR=dvdread DVDREAD_DIR=dvdread
else else
@ -65,9 +72,9 @@ VORBIS_DIR=
endif endif
SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \ 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) \ $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
$(SDL_DIR) $(VORBIS_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 lame mad mpeg2dec sdl vorbis

3
gst/playondemand/filter.func
View file

@ -116,5 +116,6 @@ do {
if (! filter->eos) { if (! filter->eos) {
in = gst_pad_pull(filter->sinkpad); in = gst_pad_pull(filter->sinkpad);
} }
gst_element_yield (GST_ELEMENT (filter));
} while (! GST_ELEMENT_IS_COTHREAD_STOPPING(elem)); } while (TRUE);