summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2010-01-25 15:14:56 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2010-01-25 15:14:56 +0100
commite4b68a3658b9830261194a65f09fe431051b23d6 (patch)
treeddafde39442a28addc3663e85c378f9fd2bc07e0
parent95511c8821d054aba43dbb24c6c4d4f27c7278e5 (diff)
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
-rw-r--r--ext/ogg/gstoggdemux.c6
-rw-r--r--ext/ogg/gstoggstream.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 36ad573b4..42037c418 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 165c2a068..78b55c06d 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;