summaryrefslogtreecommitdiffstats
path: root/gst/matroska/matroska-mux.c
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-11-10 12:22:30 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-11-10 12:22:30 +0000
commitc16c22e4c1833dfc36c60ff6adcb2b9052138ca7 (patch)
tree390441ee55952be42cf0c5565b59cb96112bb76a /gst/matroska/matroska-mux.c
parent8a534978d48d0ec22b93da6c95ac3a72a58437cb (diff)
gst/matroska/matroska-mux.c: Don't try to ready buffer duration from buffer that we don't own any longer and that mi...
Original commit message from CVS: Reviewed by: Tim-Philipp Müller <tim at centricular dot net> * gst/matroska/matroska-mux.c: (gst_matroska_mux_write_data): Don't try to ready buffer duration from buffer that we don't own any longer and that might already have been unreffed. (#321136)
Diffstat (limited to 'gst/matroska/matroska-mux.c')
-rw-r--r--gst/matroska/matroska-mux.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 78dcf960..84d59a96 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1324,6 +1324,7 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux)
guint64 cluster, blockgroup;
gboolean write_duration;
guint16 relative_timestamp;
+ guint64 block_duration;
/* which stream to write from? */
best = gst_matroska_mux_best_pad (mux);
@@ -1424,9 +1425,8 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux)
/* Check if the duration differs from the default duration. */
write_duration = FALSE;
+ block_duration = GST_BUFFER_DURATION (buf);
if (GST_BUFFER_DURATION_IS_VALID (buf)) {
- guint64 block_duration = GST_BUFFER_DURATION (buf);
-
if (block_duration != best->track->default_duration) {
write_duration = TRUE;
}
@@ -1460,8 +1460,6 @@ gst_matroska_mux_write_data (GstMatroskaMux * mux)
gst_ebml_write_buffer (ebml, hdr);
gst_ebml_write_buffer (ebml, buf);
if (write_duration) {
- guint64 block_duration = GST_BUFFER_DURATION (buf);
-
gst_ebml_write_uint (ebml, GST_MATROSKA_ID_BLOCKDURATION,
block_duration / mux->time_scale);
}