From: Ronald S. B. <rb...@pd...> - 2004-03-04 13:28:14
|
CVS Root: /home/cvs/gstreamer Module: gst-ffmpeg Changes by: rbultje Date: Thu Mar 04 2004 05:22:05 PST Log message: * 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. Modified files: . : ChangeLog configure.ac ext/ffmpeg : gstffmpegdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.8&r2=1.9 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/configure.ac.diff?r1=1.7&r2=1.8 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c.diff?r1=1.23&r2=1.24 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gst-ffmpeg/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- a/ChangeLog 3 Mar 2004 01:54:18 -0000 1.8 +++ b/ChangeLog 4 Mar 2004 13:21:53 -0000 1.9 @@ -1,3 +1,10 @@ +2004-03-04 Ronald Bultje <rb...@ro...> + + * 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 <rb...@ro...> * configure.ac: Index: configure.ac RCS file: /home/cvs/gstreamer/gst-ffmpeg/configure.ac,v retrieving revision 1.7 diff -u -d -r1.7 -r1.8 --- a/configure.ac 3 Mar 2004 01:54:18 -0000 1.7 +++ b/configure.ac 4 Mar 2004 13:21:53 -0000 1.8 @@ -84,7 +84,7 @@ 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 @@ 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 Index: gstffmpegdemux.c RCS file: /home/cvs/gstreamer/gst-ffmpeg/ext/ffmpeg/gstffmpegdemux.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- a/gstffmpegdemux.c 1 Mar 2004 04:59:17 -0000 1.23 +++ b/gstffmpegdemux.c 4 Mar 2004 13:21:53 -0000 1.24 @@ -493,7 +493,12 @@ 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; |