mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
Adds divx/xvid encoders. divx encoder is based on divx4linux (commercial, closed-source)
Original commit message from CVS: Adds divx/xvid encoders. * divx encoder is based on divx4linux (commercial, closed-source) * xvid encoder is based on xvidcore (http://www.xvid.org/, GPL - Christian? ;) ) Both use a GstCaps that doesn't conform with what we currently use, I might fix that later on or so. For now, it doesn't matter, it's just a test. We're also missing corresponding decoders (ffmpeg can decoded this too, but that's not the point), these might come later too.
This commit is contained in:
parent
475f56e0dc
commit
4e04e1c7e7
2 changed files with 50 additions and 4 deletions
33
configure.ac
33
configure.ac
|
@ -506,6 +506,21 @@ dnl FIXME : add second check somehow if that is necessary
|
||||||
dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )
|
dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )
|
||||||
dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
|
dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
|
||||||
|
|
||||||
|
dnl *** DIVX ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_DIVX, true)
|
||||||
|
GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [
|
||||||
|
HAVE_DIVX=yes
|
||||||
|
AC_CHECK_HEADER(encore2.h, ,
|
||||||
|
[ AC_MSG_WARN([Divx4linux headers not found]) &&
|
||||||
|
HAVE_DIVX=no ] )
|
||||||
|
LIBS="-lm"
|
||||||
|
AC_CHECK_LIB(divxencore, encore, ,
|
||||||
|
[ AC_MSG_WARN([Divx4linux libs not found]) &&
|
||||||
|
HAVE_DIVX=no ] )
|
||||||
|
DIVX_LIBS="-lxvidcore -lm"
|
||||||
|
AC_SUBST(DIVX_LIBS)
|
||||||
|
])
|
||||||
|
|
||||||
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], dvdreadsrc, [
|
GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdreadsrc, [
|
||||||
|
@ -875,6 +890,22 @@ GST_CHECK_FEATURE(XMMS, [xmms plug-in], xmms, [
|
||||||
AM_PATH_XMMS(0.1.0, HAVE_XMMS=yes, HAVE_XMMS=no)
|
AM_PATH_XMMS(0.1.0, HAVE_XMMS=yes, HAVE_XMMS=no)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl *** XVID ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)
|
||||||
|
GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
|
||||||
|
HAVE_XVID=yes
|
||||||
|
AC_CHECK_HEADER(xvid.h, ,
|
||||||
|
[ AC_MSG_WARN([Xvid headers not found]) &&
|
||||||
|
HAVE_XVID=no ] )
|
||||||
|
LIBS="-lm"
|
||||||
|
AC_CHECK_LIB(xvidcore, xvid_encore, ,
|
||||||
|
[ AC_MSG_WARN([Xvid libs not found]) &&
|
||||||
|
HAVE_XVID=no ] )
|
||||||
|
XVID_LIBS="-lxvidcore -lm"
|
||||||
|
AC_SUBST(XVID_LIBS)
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
fi dnl of EXT plugins
|
fi dnl of EXT plugins
|
||||||
|
|
||||||
dnl Check for atomic.h
|
dnl Check for atomic.h
|
||||||
|
@ -1127,6 +1158,7 @@ ext/artsd/Makefile
|
||||||
ext/audiofile/Makefile
|
ext/audiofile/Makefile
|
||||||
ext/avifile/Makefile
|
ext/avifile/Makefile
|
||||||
ext/cdparanoia/Makefile
|
ext/cdparanoia/Makefile
|
||||||
|
ext/divx/Makefile
|
||||||
ext/dv/Makefile
|
ext/dv/Makefile
|
||||||
ext/dvdread/Makefile
|
ext/dvdread/Makefile
|
||||||
ext/dvdnav/Makefile
|
ext/dvdnav/Makefile
|
||||||
|
@ -1162,6 +1194,7 @@ ext/swfdec/Makefile
|
||||||
ext/vorbis/Makefile
|
ext/vorbis/Makefile
|
||||||
ext/tarkin/Makefile
|
ext/tarkin/Makefile
|
||||||
ext/xmms/Makefile
|
ext/xmms/Makefile
|
||||||
|
ext/xvid/Makefile
|
||||||
gst-libs/Makefile
|
gst-libs/Makefile
|
||||||
gst-libs/gst/Makefile
|
gst-libs/gst/Makefile
|
||||||
gst-libs/gst/audio/Makefile
|
gst-libs/gst/audio/Makefile
|
||||||
|
|
|
@ -46,6 +46,12 @@ else
|
||||||
CDPARANOIA_DIR=
|
CDPARANOIA_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_DIVX
|
||||||
|
DIVX_DIR=divx
|
||||||
|
else
|
||||||
|
DIVX_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
if USE_DVDREAD
|
if USE_DVDREAD
|
||||||
DVDREAD_DIR=dvdread
|
DVDREAD_DIR=dvdread
|
||||||
else
|
else
|
||||||
|
@ -244,6 +250,12 @@ else
|
||||||
VORBIS_DIR=
|
VORBIS_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_XVID
|
||||||
|
XVID_DIR=xvid
|
||||||
|
else
|
||||||
|
XVID_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
if USE_XMMS
|
if USE_XMMS
|
||||||
XMMS_DIR=xmms
|
XMMS_DIR=xmms
|
||||||
else
|
else
|
||||||
|
@ -257,8 +269,8 @@ SNAPSHOT_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
|
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
|
||||||
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
|
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
|
||||||
$(AVIFILE_DIR) $(CDPARANOIA_DIR) \
|
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DIVX_DIR) \
|
||||||
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) $(MAS_DIR) \
|
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) $(MAS_DIR) \
|
||||||
$(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
|
$(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
|
||||||
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
|
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
|
||||||
|
@ -268,7 +280,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
|
||||||
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) \
|
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) \
|
||||||
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
|
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
|
||||||
$(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
|
$(SMOOTHWAVE_DIR) $(SWFDEC_DIR) $(TARKIN_DIR) \
|
||||||
$(VORBIS_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
|
$(VORBIS_DIR) $(XVID_DIR) $(XMMS_DIR) $(SNAPSHOT_DIR)
|
||||||
|
|
||||||
DIST_SUBDIRS=\
|
DIST_SUBDIRS=\
|
||||||
a52dec aalib alsa \
|
a52dec aalib alsa \
|
||||||
|
@ -281,4 +293,5 @@ DIST_SUBDIRS=\
|
||||||
mad mikmod mjpegtools mpeg2dec \
|
mad mikmod mjpegtools mpeg2dec \
|
||||||
openquicktime raw1394 \
|
openquicktime raw1394 \
|
||||||
sdl snapshot shout shout2 sidplay \
|
sdl snapshot shout shout2 sidplay \
|
||||||
smoothwave swfdec tarkin vorbis xmms
|
smoothwave swfdec tarkin vorbis \
|
||||||
|
xmms xvid
|
||||||
|
|
Loading…
Reference in a new issue