summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2005-11-20 17:04:55 +0000
committerJulien Moutte <julien@moutte.net>2005-11-20 17:04:55 +0000
commit7ab7f62dc2a567664e82b7acfe126e4ba83ea56e (patch)
treebf45e809ccae0fb09aabff5d554a334e8c160f82
parent985daa9d64adeace2b3dea9e319427e2154f125e (diff)
gst/matroska/matroska-mux.c: Replace
Original commit message from CVS: 2005-11-20 Julien MOUTTE <julien@moutte.net> * gst/matroska/matroska-mux.c: (gst_matroska_mux_start): Replace GST_PAD_IS_USABLE by something approaching it.
-rw-r--r--ChangeLog5
-rw-r--r--gst/matroska/matroska-mux.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ebfa870d..79b9f072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-11-20 Julien MOUTTE <julien@moutte.net>
+ * gst/matroska/matroska-mux.c: (gst_matroska_mux_start): Replace
+ GST_PAD_IS_USABLE by something approaching it.
+
+2005-11-20 Julien MOUTTE <julien@moutte.net>
+
* gst/matroska/matroska-mux.c: (gst_matroska_mux_start): Fix for
API changes.
* gst/wavenc/gstwavenc.c: (gst_wavenc_chain): Fix for API changes,
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index bba6ee23..8586c9f1 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1087,7 +1087,8 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
collect_pad = (GstMatroskaPad *) collected->data;
thepad = collect_pad->collect.pad;
- if (collect_pad->track->codec_id != 0) {
+ if (gst_pad_is_linked (thepad) && gst_pad_is_active (thepad) &&
+ collect_pad->track->codec_id != 0) {
collect_pad->track->num = tracknum++;
child = gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_TRACKENTRY);
gst_matroska_mux_track_header (mux, collect_pad->track);