diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 6a52021..f5554b1 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -2725,6 +2728,18 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
           stream->samples[stream->n_samples - 1].timestamp +
           stream->samples[stream->n_samples - 1].duration;

+      /* If there's a significative difference between the decode_ts and the */
+      /* timestamp, prefer decode_ts */
+      if ((decode_ts - timestamp) > stream->samples[stream->n_samples - 1].duration) {
+          GST_INFO_OBJECT (qtdemux, "decode_ts > timestamp, using decode_ts");
+          timestamp = decode_ts;
+      }
+
       gst_ts = QTSTREAMTIME_TO_GSTTIME (stream, timestamp);
       GST_INFO_OBJECT (qtdemux, "first sample ts %" GST_TIME_FORMAT
           " (extends previous samples)", GST_TIME_ARGS (gst_ts));