summaryrefslogtreecommitdiff
path: root/gst/gstmemory.c
diff options
context:
space:
mode:
Diffstat (limited to 'gst/gstmemory.c')
-rw-r--r--gst/gstmemory.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/gst/gstmemory.c b/gst/gstmemory.c
index 5172e978a..7c22f8335 100644
--- a/gst/gstmemory.c
+++ b/gst/gstmemory.c
@@ -527,7 +527,7 @@ gst_memory_map (GstMemory * mem, gsize * size, gsize * maxsize,
g_return_val_if_fail (mem != NULL, NULL);
if (!gst_memory_lock (mem, flags))
- goto lock_failed;
+ return NULL;
res = mem->allocator->info.map (mem, mem->maxsize, flags);
@@ -542,11 +542,6 @@ gst_memory_map (GstMemory * mem, gsize * size, gsize * maxsize,
return res + mem->offset;
/* ERRORS */
-lock_failed:
- {
- g_critical ("memory %p: failed to lock memory", mem);
- return NULL;
- }
error:
{
/* something went wrong, restore the orginal state again */