From 99298da3d50f5d0881008d3fa690df9ad708e467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sun, 1 Feb 2009 16:58:51 +0100
Subject: Fix deadlocks when seeking in pull mode failed and check new offset
 before using it

---
 gst/mxf/mxfdemux.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gst/mxf/mxfdemux.c b/gst/mxf/mxfdemux.c
index de1f3a0e..70b89135 100644
--- a/gst/mxf/mxfdemux.c
+++ b/gst/mxf/mxfdemux.c
@@ -2883,7 +2883,10 @@ gst_mxf_demux_seek_pull (GstMXFDemux * demux, GstEvent * event)
       }
       p->discont = TRUE;
     }
-    demux->offset = new_offset;
+    if (new_offset == -1)
+      goto no_new_offset;
+
+    demux->offset = new_offset + demux->run_in;
   }
 
   if (G_UNLIKELY (demux->close_seg_event)) {
@@ -2946,10 +2949,16 @@ wrong_rate:
   }
 unresolved_metadata:
   {
+    GST_PAD_STREAM_UNLOCK (demux->sinkpad);
     GST_WARNING_OBJECT (demux, "metadata can't be resolved");
     return FALSE;
   }
-
+no_new_offset:
+  {
+    GST_PAD_STREAM_UNLOCK (demux->sinkpad);
+    GST_WARNING_OBJECT (demux, "can't find new offset");
+    return FALSE;
+  }
 }
 
 static gboolean
-- 
cgit v1.2.1