projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d646a34
)
Revert qtmux: Use buffer PTS if DTS is not set"
author
Matej Knopp
<matej.knopp@gmail.com>
Tue, 3 Sep 2013 16:14:04 +0000
(18:14 +0200)
committer
Sebastian Dröge
<slomo@circular-chaos.org>
Mon, 16 Sep 2013 10:13:54 +0000
(12:13 +0200)
This reverts commit
f72c3cf71fde622067f41f31a53978ba4c94469d
.
https://bugzilla.gnome.org/show_bug.cgi?id=707340
gst/isomp4/gstqtmux.c
patch
|
blob
|
history
diff --git
a/gst/isomp4/gstqtmux.c
b/gst/isomp4/gstqtmux.c
index
6a9de52
..
7207a00
100644
(file)
--- a/
gst/isomp4/gstqtmux.c
+++ b/
gst/isomp4/gstqtmux.c
@@
-2229,10
+2229,7
@@
gst_qt_mux_add_buffer (GstQTMux * qtmux, GstQTPad * pad, GstBuffer * buf)
if (pad->have_dts) {
gint64 scaled_dts;
if (pad->last_buf) {
- if (GST_BUFFER_DTS_IS_VALID (pad->last_buf))
- pad->last_dts = GST_BUFFER_DTS (pad->last_buf);
- else
- pad->last_dts = GST_BUFFER_PTS (pad->last_buf);
+ pad->last_dts = GST_BUFFER_DTS (pad->last_buf);
} else {
pad->last_dts = GST_BUFFER_DTS (last_buf) +
GST_BUFFER_DURATION (last_buf);