gst/dvdsub/gstdvdsubdec.c: which happens when you use macros that got changed during...

Original commit message from CVS:
Patch by: Frédéric Riss  <frederic.riss at gmail com>
* gst/dvdsub/gstdvdsubdec.c: (gst_send_subtitle_frame):
Don't set negative durations on outgoing buffers (#350044),
which happens when you use macros that got changed during
the last unstable cycle because they were thought not to
be used anywhere.

diff --git a/ChangeLog b/ChangeLog
index 5b84b47..b6dc2ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-07  Tim-Philipp Müller  <tim at centricular dot net>
+
+       Patch by: Frédéric Riss  <frederic.riss at gmail com>
+
+       * gst/dvdsub/gstdvdsubdec.c: (gst_send_subtitle_frame):
+         Don't set negative durations on outgoing buffers (#350044),
+         which happens when you use macros that got changed during
+         the last unstable cycle because they were thought not to
+         be used anywhere.
+         
 2006-08-06  Tim-Philipp Müller  <tim at centricular dot net>
 
        * ext/dvdread/dvdreadsrc.c: (gst_dvd_read_src_stop),

diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c
index 2d39e3a..dd05fc2 100644 (file)
--- a/gst/dvdsub/gstdvdsubdec.c
+++ b/gst/dvdsub/gstdvdsubdec.c
@@ -664,7 +664,7 @@ gst_send_subtitle_frame (GstDvdSubDec * dec, GstClockTime end_ts)
       GST_BUFFER_SIZE (dec->out_buffer));
 
   GST_BUFFER_TIMESTAMP (out_buf) = dec->next_ts;
-  GST_BUFFER_DURATION (out_buf) = GST_CLOCK_DIFF (end_ts, dec->next_ts);
+  GST_BUFFER_DURATION (out_buf) = GST_CLOCK_DIFF (dec->next_ts, end_ts);
 
   GST_DEBUG_OBJECT (dec, "Sending subtitle buffer with ts %"
       GST_TIME_FORMAT ", dur %" G_GINT64_FORMAT,