From: 이문형 Date: Mon, 1 Dec 2008 19:36:35 +0000 (+0000) Subject: gst-libs/gst/app/gstappsrc.c: Don't forget to release the lock again if we bail out... X-Git-Tag: 1.19.3~511^2~10154 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=933186aaa183d098d1be0b5d5c0bfd9fec4caf0b;p=platform%2Fupstream%2Fgstreamer.git gst-libs/gst/app/gstappsrc.c: Don't forget to release the lock again if we bail out because some pad is flushing or w... Original commit message from CVS: Patch by: 이문형 * gst-libs/gst/app/gstappsrc.c: (gst_app_src_push_buffer): Don't forget to release the lock again if we bail out because some pad is flushing or we've reached EOS, otherwise things will lock up next time _push_buffer() is called (#562802). --- diff --git a/common b/common index 03699ff..9a48616 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 03699ffc577ee8a42541862f11a6d0d0dff34f41 +Subproject commit 9a486164b87586f7b936a55b1ee56a14cd4e2c73 diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c index a10f9a3..3bec52f 100644 --- a/gst-libs/gst/app/gstappsrc.c +++ b/gst-libs/gst/app/gstappsrc.c @@ -991,12 +991,14 @@ flushing: { GST_DEBUG_OBJECT (appsrc, "refuse buffer %p, we are flushing", buffer); gst_buffer_unref (buffer); + g_mutex_unlock (appsrc->mutex); return GST_FLOW_WRONG_STATE; } eos: { GST_DEBUG_OBJECT (appsrc, "refuse buffer %p, we are EOS", buffer); gst_buffer_unref (buffer); + g_mutex_unlock (appsrc->mutex); return GST_FLOW_UNEXPECTED; } }