Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-04-19 19:30:28 +02:00
commit 8e76da20b6

View file

@ -4205,8 +4205,8 @@ slow_path:
}
invalid:
{
pad_free_cache (cache);
GST_PAD_STREAM_UNLOCK (peer);
pad_free_cache (cache);
goto slow_path;
}
}
@ -4317,8 +4317,8 @@ slow_path:
}
invalid:
{
pad_free_cache (cache);
GST_PAD_STREAM_UNLOCK (peer);
pad_free_cache (cache);
goto slow_path;
}
}