diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-docs.sgml | 1 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-sections.txt | 13 | ||||
| -rw-r--r-- | ext/Makefile.am | 9 | ||||
| -rw-r--r-- | gst/vmnc/Makefile.am | 2 |
7 files changed, 4 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index aaa72137d..4bcaa888c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,7 +82,9 @@ CRUFT_DIRS = \ $(top_srcdir)/ext/alsaspdif \ $(top_srcdir)/ext/ivorbis \ $(top_srcdir)/ext/jack \ - $(top_srcdir)/ext/metadata + $(top_srcdir)/ext/metadata \ + $(top_srcdir)/ext/tarkin \ + $(top_srcdir)/ext/theora include $(top_srcdir)/common/cruft.mak diff --git a/configure.ac b/configure.ac index 8c37a8144..5efaedf32 100644 --- a/configure.ac +++ b/configure.ac @@ -1649,7 +1649,6 @@ AM_CONDITIONAL(USE_SPC, false) AM_CONDITIONAL(USE_GME, false) AM_CONDITIONAL(USE_GSETTINGS, false) AM_CONDITIONAL(USE_SWFDEC, false) -AM_CONDITIONAL(USE_THEORADEC, false) AM_CONDITIONAL(USE_XVID, false) AM_CONDITIONAL(USE_DVB, false) AM_CONDITIONAL(USE_WININET, false) diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 0d124a74b..b5dc83a16 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -129,7 +129,6 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/rsvg/gstrsvgoverlay.h \ $(top_srcdir)/ext/sdl/sdlaudiosink.h \ $(top_srcdir)/ext/sdl/sdlvideosink.h \ - $(top_srcdir)/ext/theora/theoradec.h \ $(top_srcdir)/ext/timidity/gsttimidity.h \ $(top_srcdir)/ext/timidity/gstwildmidi.h \ $(top_srcdir)/ext/vp8/gstvp8enc.h \ diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index 8cbad1e7d..f5dc1a32f 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -113,7 +113,6 @@ <xi:include href="xml/element-square.xml" /> <xi:include href="xml/element-stereo.xml" /> <xi:include href="xml/element-stretch.xml" /> - <!--xi:include href="xml/element-theoradecexp.xml" /--> <xi:include href="xml/element-templatematch.xml" /> <xi:include href="xml/element-textwrite.xml" /> <xi:include href="xml/element-tiger.xml" /> diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 98e3264d6..03c050c32 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -1508,19 +1508,6 @@ gst_textwrite_plugin_init </SECTION> <SECTION> -<FILE>element-theoradecexp</FILE> -<TITLE>theoradecexp</TITLE> -GstTheoraExpDec -<SUBSECTION Standard> -GstTheoraExpDecClass -GST_THEORA_DEC_EXP -GST_THEORA_DEC_EXP_CLASS -GST_IS_THEORA_DEC_EXP -GST_IS_THEORA_DEC_EXP_CLASS -GST_TYPE_THEORA_DEC_EXP -</SECTION> - -<SECTION> <FILE>element-timidity</FILE> <TITLE>timidity</TITLE> GstTimidity diff --git a/ext/Makefile.am b/ext/Makefile.am index 552926f06..d6638d091 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -336,12 +336,6 @@ else GSETTINGS_DIR= endif -# if USE_XINE -# XINE_DIR=xine -# else -XINE_DIR= -# endif - if USE_XVID XVID_DIR=xvid else @@ -415,11 +409,8 @@ SUBDIRS=\ $(GME_DIR) \ $(SPC_DIR) \ $(SWFDEC_DIR) \ - $(TARKIN_DIR) \ - $(THEORA_DIR) \ $(TIMIDITY_DIR) \ $(VP8_DIR) \ - $(XINE_DIR) \ $(XVID_DIR) \ $(ZBAR_DIR) \ $(RTMP_DIR) diff --git a/gst/vmnc/Makefile.am b/gst/vmnc/Makefile.am index 55074c15b..f807c2cbb 100644 --- a/gst/vmnc/Makefile.am +++ b/gst/vmnc/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstvmnc.la libgstvmnc_la_SOURCES = vmncdec.c -libgstvmnc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(THEORA_CFLAGS) +libgstvmnc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstvmnc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) libgstvmnc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvmnc_la_LIBTOOLFLAGS = --tag=disable-static |