summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <olivier.crete@collabora.co.uk>2010-09-30 16:22:04 -0400
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-12-31 00:51:11 +0000
commit473be88d5d187ecd1b445137683ae7621d0662b1 (patch)
tree2729c88b802db774f64d98f45b2c657575b95ac1
parent37e02eb7c75f220fad57933b6f15e6e3ac223bf1 (diff)
valve: Correctly set the DISCONT flag after dropping buffers
-rw-r--r--plugins/elements/gstvalve.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/elements/gstvalve.c b/plugins/elements/gstvalve.c
index 38bc52cfc4..8754abdaaa 100644
--- a/plugins/elements/gstvalve.c
+++ b/plugins/elements/gstvalve.c
@@ -190,18 +190,19 @@ gst_valve_chain (GstPad * pad, GstBuffer * buffer)
GST_OBJECT_LOCK (valve);
drop = valve->drop;
-
- if (!drop && valve->discont) {
- buffer = gst_buffer_make_metadata_writable (buffer);
- GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
- valve->discont = FALSE;
- }
GST_OBJECT_UNLOCK (valve);
- if (drop)
+ if (drop) {
gst_buffer_unref (buffer);
- else
+ valve->discont = TRUE;
+ } else {
+ if (valve->discont) {
+ buffer = gst_buffer_make_metadata_writable (buffer);
+ GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT);
+ }
+
ret = gst_pad_push (valve->srcpad, buffer);
+ }
/* Ignore errors if "drop" was changed while the thread was blocked