Commit c9b89b2f authored by Ronald S. Bultje's avatar Ronald S. Bultje

configure.ac: Brackets cause autoconf errors. So remove them.

Original commit message from CVS:
* configure.ac:
Brackets cause autoconf errors. So remove them.
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_add):
Actually use the event/convert/query functions. D'oh.
parent a8e81039
2004-03-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
Brackets cause autoconf errors. So remove them.
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_add):
Actually use the event/convert/query functions. D'oh.
2004-03-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
......
......@@ -84,7 +84,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
if test "x$GST_PLUGINS_VERSION_NANO" = x1; then
AC_MSG_NOTICE(slurping FFmpeg CVS source)
dnl until someone fixes this... I guess this should be in ./autogen.sh
AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2004-02-29 20:00 GMT,[
AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2004-02-29 20:00 GMT,
if ! test -f gst-libs/ext/ffmpeg/ffmpeg/configure.ac; then
AC_MSG_NOTICE(setting up ffmpeg build system and applying patches)
CURDIR=`pwd`
......@@ -97,7 +97,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
NOCONFIGURE=1 ./autogen.sh
cd $CURDIR
fi
HAVE_FFMPEG=yes ], HAVE_FFMPEG=no)
HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
else
AC_MSG_NOTICE(FFmpeg CVS code should be included already)
HAVE_FFMPEG=yes
......
......@@ -493,7 +493,12 @@ gst_ffmpegdemux_add (GstFFMpegDemux *demux,
g_free (padname);
gst_pad_use_explicit_caps (pad);
/* FIXME: srcevent(), convert() and query() functions for pad */
gst_pad_set_formats_function (pad, gst_ffmpegdemux_src_format_list);
gst_pad_set_event_mask_function (pad, gst_ffmpegdemux_src_event_mask);
gst_pad_set_event_function (pad, gst_ffmpegdemux_src_event);
gst_pad_set_query_type_function (pad, gst_ffmpegdemux_src_query_list);
gst_pad_set_query_function (pad, gst_ffmpegdemux_src_query);
gst_pad_set_convert_function (pad, gst_ffmpegdemux_src_convert);
/* store pad internally */
demux->srcpads[stream->index] = pad;
......
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