diff options
| author | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
| commit | ef3ed344af7d0eb330f68c85d31acfa9471d1573 (patch) | |
| tree | 012d45187cfa98f972073142ce341190252e17f7 /gst-libs/gst/audio/audioclock.h | |
| parent | 70a4a0e00218745b2bf7ad0b145fe9a967981cb4 (diff) | |
| download | gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.gz gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.bz2 gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.zip | |
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Original commit message from CVS:
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Diffstat (limited to 'gst-libs/gst/audio/audioclock.h')
| -rw-r--r-- | gst-libs/gst/audio/audioclock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/audio/audioclock.h b/gst-libs/gst/audio/audioclock.h index f588dee8..17439242 100644 --- a/gst-libs/gst/audio/audioclock.h +++ b/gst-libs/gst/audio/audioclock.h @@ -60,13 +60,13 @@ struct _GstAudioClock { gboolean active; - GST_OBJECT_PADDING + gpointer _gst_reserved[GST_PADDING]; }; struct _GstAudioClockClass { GstSystemClockClass parent_class; - GST_CLASS_PADDING + gpointer _gst_reserved[GST_PADDING]; }; GType gst_audio_clock_get_type (void); |