From a1f95f562513fa5366ecc5e3c4adf497fb54ea72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 19 Dec 2013 21:59:09 +0100
Subject: [PATCH] audiomixer: Also resync timestamps on the RESYNC flag

---
 gst/audiomixer/gstaudiomixer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c
index 28f8e513d0..2605cc3705 100644
--- a/gst/audiomixer/gstaudiomixer.c
+++ b/gst/audiomixer/gstaudiomixer.c
@@ -1289,7 +1289,9 @@ gst_audio_mixer_fill_buffer (GstAudioMixer * audiomixer, GstCollectPads * pads,
   start_offset = gst_util_uint64_scale (start_time, rate, GST_SECOND);
   end_offset = start_offset + adata->size / bpf;
 
-  if (GST_BUFFER_IS_DISCONT (inbuf) || adata->next_offset == -1) {
+  if (GST_BUFFER_IS_DISCONT (inbuf)
+      || GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_RESYNC)
+      || adata->next_offset == -1) {
     discont = TRUE;
   } else {
     guint64 diff, max_sample_diff;