summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-01-30 20:23:23 +0000
committerBenjamin Otte <otte@gnome.org>2004-01-30 20:23:23 +0000
commit28d6dd44a86af1f1f41becbf0cca954e29949571 (patch)
treec6ae53e036ffb8d5ed0364bd78de74c384f920fd
parent4ee5e3e7db8e375c6ff3cb4d17b56d21bf910ed5 (diff)
downloadgst-plugins-bad-28d6dd44a86af1f1f41becbf0cca954e29949571.tar.gz
gst-plugins-bad-28d6dd44a86af1f1f41becbf0cca954e29949571.tar.bz2
gst-plugins-bad-28d6dd44a86af1f1f41becbf0cca954e29949571.zip
configure.ac: use AC_C_INLINE
Original commit message from CVS: 2004-01-30 Benjamin Otte <in7y118@public.uni-hamburg.de> * configure.ac: use AC_C_INLINE * configure.ac: * ext/Makefile.am: * ext/theora/Makefile.am: * ext/theora/theoradec.c: add theora video decoder. Does just do simple decoding for now and has been tested against Theora cvs only. * ext/vorbis/vorbisdec.c: (vorbis_dec_event): always reset packetno on DISCONT
-rw-r--r--ChangeLog13
m---------common0
-rw-r--r--configure.ac12
-rw-r--r--ext/Makefile.am8
4 files changed, 32 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index edfd98b9..d1892422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-01-30 Benjamin Otte <in7y118@public.uni-hamburg.de>
+
+ * configure.ac:
+ use AC_C_INLINE
+ * configure.ac:
+ * ext/Makefile.am:
+ * ext/theora/Makefile.am:
+ * ext/theora/theoradec.c:
+ add theora video decoder. Does just do simple decoding for now and
+ has been tested against Theora cvs only.
+ * ext/vorbis/vorbisdec.c: (vorbis_dec_event):
+ always reset packetno on DISCONT
+
2004-01-30 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead):
diff --git a/common b/common
-Subproject 5da247bb6f217c5c32e5ebab0d3a2014dfa452c
+Subproject 508678c12ea745e207eb8bb3be12c156e3bb698
diff --git a/configure.ac b/configure.ac
index 0fa8bc55..25a828ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,6 +81,7 @@ AC_PROG_CXXCPP
AC_ISC_POSIX
AC_HEADER_STDC([])
+AC_C_INLINE
dnl Check for a way to display the function name in debug output
GST_CHECK_FUNCTION()
@@ -1333,6 +1334,14 @@ GST_CHECK_FEATURE(OGG, [ogg de/encoder], oggdemux oggmux, [
AS_SCRUB_INCLUDE(OGG_CFLAGS)
])
+dnl *** theora ***
+dnl FIXME: theora doesn't have proper pc/m4 files yet, change this when this happens
+translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true)
+GST_CHECK_FEATURE(THEORA, [ogg theora codec], theoradec, [
+ GST_CHECK_LIBHEADER(THEORA, theora, theora_version_string, , theora/theora.h, THEORA_LIBS="-ltheora")
+ AC_SUBST(THEORA_LIBS)
+])
+
dnl *** vorbis ***
dnl AM_PATH_VORBIS only takes two options
translit(dnm, m, l) AM_CONDITIONAL(USE_VORBIS, true)
@@ -1687,8 +1696,9 @@ ext/snapshot/Makefile
ext/speex/Makefile
ext/sndfile/Makefile
ext/swfdec/Makefile
-ext/vorbis/Makefile
ext/tarkin/Makefile
+ext/theora/Makefile
+ext/vorbis/Makefile
ext/xvid/Makefile
gst-libs/Makefile
gst-libs/gst/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 0e091de5..182ac56a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -298,6 +298,12 @@ else
VORBIS_DIR=
endif
+if USE_THEORA
+THEORA_DIR=theora
+else
+THEORA_DIR=
+endif
+
if USE_XVID
XVID_DIR=xvid
else
@@ -366,6 +372,7 @@ SUBDIRS=\
$(SPEEX_DIR) \
$(SWFDEC_DIR) \
$(TARKIN_DIR) \
+ $(THEORA_DIR) \
$(IVORBIS_DIR) \
$(VORBIS_DIR) \
$(XVID_DIR)
@@ -422,5 +429,6 @@ DIST_SUBDIRS=\
speex \
swfdec \
tarkin \
+ theora \
vorbis \
xvid