diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
index 50f97d1fb8..4b7f1aba2a 100644
--- a/sys/decklink/gstdecklinkaudiosrc.cpp
+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
@@ -324,6 +324,7 @@ gst_decklink_audio_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
   gsize data_size;
   CapturePacket *p;
   AudioPacket *ap;
+  GstClockTime timestamp, duration;
 
   g_mutex_lock (&self->lock);
   while (g_queue_is_empty (&self->current_packets) && !self->flushing) {
@@ -356,9 +357,17 @@ gst_decklink_audio_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
   ap->input->AddRef ();
 
   // TODO: Jitter/discont handling
-  GST_BUFFER_TIMESTAMP (*buffer) = p->capture_time;
-  GST_BUFFER_DURATION (*buffer) =
+  duration =
       gst_util_uint64_scale_int (sample_count, GST_SECOND, self->info.rate);
+  // Our capture time is the end timestamp, subtract the
+  // duration to get the start timestamp
+  if (p->capture_time >= duration)
+    timestamp = p->capture_time - duration;
+  else
+    timestamp = 0;
+
+  GST_BUFFER_TIMESTAMP (*buffer) = timestamp;
+  GST_BUFFER_DURATION (*buffer) = duration;
 
   capture_packet_free (p);
 
diff --git a/sys/decklink/gstdecklinkvideosrc.cpp b/sys/decklink/gstdecklinkvideosrc.cpp
index effdd253b9..47b54cd1f3 100644
--- a/sys/decklink/gstdecklinkvideosrc.cpp
+++ b/sys/decklink/gstdecklinkvideosrc.cpp
@@ -268,6 +268,7 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
   gsize data_size;
   VideoFrame *vf;
   CaptureFrame *f;
+  GstClockTime timestamp, duration;
 
   g_mutex_lock (&self->lock);
   while (g_queue_is_empty (&self->current_frames) && !self->flushing) {
@@ -299,9 +300,18 @@ gst_decklink_video_src_create (GstPushSrc * bsrc, GstBuffer ** buffer)
   vf->input = self->input->input;
   vf->input->AddRef ();
 
-  GST_BUFFER_TIMESTAMP (*buffer) = f->capture_time;
-  GST_BUFFER_DURATION (*buffer) = gst_util_uint64_scale_int (GST_SECOND,
-      self->info.fps_d, self->info.fps_n);
+  duration =
+      gst_util_uint64_scale_int (GST_SECOND, self->info.fps_d,
+      self->info.fps_n);
+  // Our capture time is the end timestamp, subtract the
+  // duration to get the start timestamp
+  if (f->capture_time >= duration)
+    timestamp = f->capture_time - duration;
+  else
+    timestamp = 0;
+
+  GST_BUFFER_TIMESTAMP (*buffer) = timestamp;
+  GST_BUFFER_DURATION (*buffer) = duration;
 
   capture_frame_free (f);