Commit ebed8d87 authored by Benjamin Otte's avatar Benjamin Otte

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
parent 184abd52
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):
......
common @ 508678c1
Subproject commit 5da247bb6f217c5c32e5ebab0d3a2014dfa452c3
Subproject commit 508678c12ea745e207eb8bb3be12c156e3bb698c
......@@ -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
......
......@@ -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
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgsttheora.la
libgsttheora_la_SOURCES = theoradec.c
libgsttheora_la_CFLAGS = $(GST_CFLAGS) $(THEORA_CFLAGS)
libgsttheora_la_LIBADD = $(THEORA_LIBS)
libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
This diff is collapsed.
......@@ -253,12 +253,12 @@ vorbis_dec_event (GstVorbisDec *dec, GstEvent *event)
case GST_EVENT_DISCONTINUOUS:
if (gst_event_discont_get_value (event, GST_FORMAT_DEFAULT, &value)) {
dec->granulepos = value;
dec->packetno = 3;
GST_DEBUG_OBJECT (dec, "setting granuleposition to %"G_GUINT64_FORMAT" after discont\n", value);
} else {
GST_WARNING_OBJECT (dec,
"discont event didn't include offset, we might set it wrong now");
}
dec->packetno = 3;
break;
default:
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment