From 67a8e53aef6d1bc560b0054f08006bb38a1ad07f Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Mon, 13 Feb 2012 12:26:11 +0100
Subject: [PATCH] h264parse: fixup merge

---
 gst/videoparsers/gsth264parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c
index d7890f6749..0118822f84 100644
--- a/gst/videoparsers/gsth264parse.c
+++ b/gst/videoparsers/gsth264parse.c
@@ -654,7 +654,7 @@ gst_h264_parse_check_valid_frame (GstBaseParse * parse,
   GstMapInfo map;
   guint8 *data;
   gsize size;
-  guint current_off = 0;
+  gint current_off = 0;
   gboolean drain, nonext;
   GstH264NalParser *nalparser = h264parse->nalparser;
   GstH264NalUnit nalu;
-- 
2.34.1