From: <wt...@ke...> - 2010-01-25 14:16:34
|
Module: gst-plugins-base Branch: master Commit: e4b68a3658b9830261194a65f09fe431051b23d6 URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=e4b68a3658b9830261194a65f09fe431051b23d6 Author: Wim Taymans <wim...@co...> Date: Mon Jan 25 15:14:56 2010 +0100 oggdemux: use right type for the serialno Use a consistent type for the serialno to avoid problems when comparing between signed and unsigned variants. Fixes #607926 --- ext/ogg/gstoggdemux.c | 6 +++--- ext/ogg/gstoggstream.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 36ad573..42037c4 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -2551,7 +2551,7 @@ gst_ogg_demux_read_end_chain (GstOggDemux * ogg, GstOggChain * chain) /* find a pad with a given serial number */ static GstOggPad * -gst_ogg_demux_find_pad (GstOggDemux * ogg, int serialno) +gst_ogg_demux_find_pad (GstOggDemux * ogg, glong serialno) { GstOggPad *pad; gint i; @@ -2583,7 +2583,7 @@ gst_ogg_demux_find_pad (GstOggDemux * ogg, int serialno) /* find a chain with a given serial number */ static GstOggChain * -gst_ogg_demux_find_chain (GstOggDemux * ogg, int serialno) +gst_ogg_demux_find_chain (GstOggDemux * ogg, glong serialno) { GstOggPad *pad; @@ -2750,7 +2750,7 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page) { GstOggPad *pad; gint64 granule; - guint serialno; + glong serialno; GstFlowReturn result = GST_FLOW_OK; serialno = ogg_page_serialno (page); diff --git a/ext/ogg/gstoggstream.h b/ext/ogg/gstoggstream.h index 165c2a0..78b55c0 100644 --- a/ext/ogg/gstoggstream.h +++ b/ext/ogg/gstoggstream.h @@ -34,7 +34,7 @@ struct _GstOggStream { ogg_stream_state stream; - guint32 serialno; + glong serialno; GList *headers; gboolean have_headers; GList *queued; |