[gst-cvs] tpm gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst-libs/gst/app/

[<tp...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     tpm
Date:           Mon Dec 01 2008  19:36:49 UTC

Log message:
	Patch by: 이문형 <iwings at gmail dot com>
	* 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).

Modified files:
    .               : ChangeLog
    gst-libs/gst/app: gstappsrc.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3776&r2=1.3777
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst-libs/gst/app/gstappsrc.c.diff?r1=1.11&r2=1.12

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3776
retrieving revision 1.3777
diff -u -d -r1.3776 -r1.3777
--- ChangeLog	1 Dec 2008 16:37:43 -0000	1.3776
+++ ChangeLog	1 Dec 2008 19:36:30 -0000	1.3777
@@ -1,3 +1,12 @@
+2008-12-01  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	Patch by: 이문형 <iwings at gmail dot com>
+	* 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).
 2008-12-01  Mark Nauwelaerts  <mar...@co...>
 
 	* gst/qtmux/atoms.c: (build_jp2h_extension):
Index: gstappsrc.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst-libs/gst/app/gstappsrc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gstappsrc.c	10 Nov 2008 14:53:45 -0000	1.11
+++ gstappsrc.c	1 Dec 2008 19:36:35 -0000	1.12
@@ -991,12 +991,14 @@
   {
     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);
     return GST_FLOW_UNEXPECTED;
 }