summaryrefslogtreecommitdiffstats
path: root/gst/avi/gstavimux.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-01-28 20:02:14 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-01-28 20:02:14 +0000
commitb0e9998114fafbbec8d6c12270b3bc577d60380c (patch)
tree40f17f9d4ebf0ce1c50c194dd37cab7fb8da4f18 /gst/avi/gstavimux.c
parentd1dcf80a9f1b5be47fa3498515a941dc15a16415 (diff)
DOH! (yes, I'm a moron)
Original commit message from CVS: DOH! (yes, I'm a moron)
Diffstat (limited to 'gst/avi/gstavimux.c')
-rw-r--r--gst/avi/gstavimux.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index d46051ae..bcb7f42d 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -442,9 +442,9 @@ done:
}
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 @@ gst_avimux_pad_connect (GstPad *pad,
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 @@ gst_avimux_request_new_pad (GstElement *element,
}
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 @@ gst_avimux_start_file (GstAviMux *avimux)
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);