mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2004-03-04 13:21:53 +00:00
parent a8e810391f
commit c9b89b2fec
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
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> 2004-03-02 Ronald Bultje <rbultje@ronald.bitfreak.net>
* configure.ac: * configure.ac:

4
configure.ac
View file

@ -84,7 +84,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
if test "x$GST_PLUGINS_VERSION_NANO" = x1; then if test "x$GST_PLUGINS_VERSION_NANO" = x1; then
AC_MSG_NOTICE(slurping FFmpeg CVS source) AC_MSG_NOTICE(slurping FFmpeg CVS source)
dnl until someone fixes this... I guess this should be in ./autogen.sh 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 if ! test -f gst-libs/ext/ffmpeg/ffmpeg/configure.ac; then
AC_MSG_NOTICE(setting up ffmpeg build system and applying patches) AC_MSG_NOTICE(setting up ffmpeg build system and applying patches)
CURDIR=`pwd` CURDIR=`pwd`
@ -97,7 +97,7 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
cd $CURDIR cd $CURDIR
fi fi
HAVE_FFMPEG=yes ], HAVE_FFMPEG=no) HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
else else
AC_MSG_NOTICE(FFmpeg CVS code should be included already) AC_MSG_NOTICE(FFmpeg CVS code should be included already)
HAVE_FFMPEG=yes HAVE_FFMPEG=yes

7
ext/ffmpeg/gstffmpegdemux.c
View file

@ -493,7 +493,12 @@ gst_ffmpegdemux_add (GstFFMpegDemux *demux,
g_free (padname); g_free (padname);
gst_pad_use_explicit_caps (pad); 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 */ /* store pad internally */
demux->srcpads[stream->index] = pad; demux->srcpads[stream->index] = pad;