From: Ronald B. <rb...@us...> - 2003-01-28 20:02:36
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Tue Jan 28 2003 12:02:31 PST Log message: DOH! (yes, I'm a moron) Modified files: gst/avi : gstavimux.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/avi/gstavimux.c.diff?r1=1.29&r2=1.30 ====Begin Diffs==== Index: gstavimux.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/gst/avi/gstavimux.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- gstavimux.c 26 Jan 2003 16:25:59 -0000 1.29 +++ gstavimux.c 28 Jan 2003 20:02:14 -0000 1.30 @@ -442,9 +442,9 @@ } static void -gst_avimux_pad_connect (GstPad *pad, - GstPad *peer, - gpointer data) +gst_avimux_pad_link (GstPad *pad, + GstPad *peer, + gpointer data) { GstAviMux *avimux = GST_AVIMUX(data); const gchar *padname = gst_pad_get_name (pad); @@ -468,8 +468,8 @@ static void gst_avimux_pad_unlink (GstPad *pad, - GstPad *peer, - gpointer data) + GstPad *peer, + gpointer data) { GstAviMux *avimux = GST_AVIMUX(data); const gchar *padname = gst_pad_get_name (pad); @@ -531,7 +531,7 @@ } g_signal_connect(newpad, "linked", - G_CALLBACK(gst_avimux_pad_connect), (gpointer)avimux); + G_CALLBACK(gst_avimux_pad_link), (gpointer)avimux); g_signal_connect(newpad, "unlinked", G_CALLBACK(gst_avimux_pad_unlink), (gpointer)avimux); gst_pad_set_link_function (newpad, gst_avimux_sinkconnect); @@ -925,7 +925,7 @@ avimux->idx = NULL; /* header */ - avimux->avi_hdr.streams = avimux->video_pad_connected?1:0 + avimux->audio_pad_connected?1:0; + avimux->avi_hdr.streams = (avimux->video_pad_connected?1:0) + (avimux->audio_pad_connected?1:0); avimux->is_bigfile = FALSE; header = gst_avimux_riff_get_avi_header(avimux); |