diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2001-03-01 22:36:26 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2001-03-01 22:36:26 +0000 |
| commit | 90ac5da6d6fe07dc902502cfed96a779b1717e23 (patch) | |
| tree | 8744445209d6438a7be507e3c9bbfcbb3f76f993 /gst/gstcaps.c | |
| parent | 81197b7c0663cf731a4b270fcae7b08e76f2572d (diff) | |
Merge with the main trunk.BRANCH-AUTOPLUG2-20010301
Original commit message from CVS:
Merge with the main trunk.
GstPlay needed some changes for the dynamic pads in the avidecoder since
the new autoplugger doesn't know about the outher elements. The next
version of the autoplugger will also handle the audfio/videosink connections
and will do a complete end-to-end autoplugging.
Diffstat (limited to 'gst/gstcaps.c')
| -rw-r--r-- | gst/gstcaps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/gstcaps.c b/gst/gstcaps.c index d9268e48d7..ebdaccc301 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -252,11 +252,11 @@ gst_caps_get_type_id (GstCaps *caps) * Set the type id of the caps. */ void -gst_caps_set_type_id (GstCaps *caps, guint16 typeid) +gst_caps_set_type_id (GstCaps *caps, guint16 type_id) { g_return_if_fail (caps != NULL); - caps->id = typeid; + caps->id = type_id; } /** |