diff options
| author | Mark Nauwelaerts <mnauw@users.sourceforge.net> | 2016-02-22 13:25:51 +0100 |
|---|---|---|
| committer | Mark Nauwelaerts <mnauw@users.sourceforge.net> | 2016-02-22 16:05:41 +0100 |
| commit | 7456ee1e1bb96144dd9dedb4b8c65036e484b5c7 (patch) | |
| tree | 36461c044c7badf724fe9b399d23b4c0be980188 | |
| parent | 93cd4be8d595eb7f540297a8442d36006f05d373 (diff) | |
| download | gstreamer-plugins-good-7456ee1e1bb96144dd9dedb4b8c65036e484b5c7.tar.gz | |
matroska: remove confusing duplicate track uid field
| -rw-r--r-- | gst/matroska/matroska-ids.h | 1 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/gst/matroska/matroska-ids.h b/gst/matroska/matroska-ids.h index c4419c291..a2171b37c 100644 --- a/gst/matroska/matroska-ids.h +++ b/gst/matroska/matroska-ids.h @@ -522,7 +522,6 @@ struct _GstMatroskaTrackContext { gint index_writer_id; /* some often-used info */ - guint64 track_uid; gchar *codec_id, *codec_name, *name, *language; gpointer codec_priv; gsize codec_priv_size; diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 9dad18bb5..ea5586b4b 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -595,7 +595,7 @@ gst_matroska_pad_reset (GstMatroskaPad * collect_pad, gboolean full) context->type = type; context->name = name; - context->track_uid = gst_matroska_mux_create_uid (collect_pad->mux); + context->uid = gst_matroska_mux_create_uid (collect_pad->mux); /* TODO: check default values for the context */ context->flags = GST_MATROSKA_TRACK_ENABLED | GST_MATROSKA_TRACK_DEFAULT; collect_pad->track = context; @@ -2387,7 +2387,7 @@ gst_matroska_mux_track_header (GstMatroskaMux * mux, gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TRACKNUMBER, context->num); gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TRACKTYPE, context->type); - gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TRACKUID, context->track_uid); + gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TRACKUID, context->uid); if (context->default_duration) { gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TRACKDEFAULTDURATION, context->default_duration); @@ -2978,8 +2978,7 @@ gst_matroska_mux_write_stream_tags (GstMatroskaMux * mux, GstMatroskaPad * mpad) master_tag = gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_TAG); master_targets = gst_ebml_write_master_start (ebml, GST_MATROSKA_ID_TARGETS); - gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TARGETTRACKUID, - mpad->track->track_uid); + gst_ebml_write_uint (ebml, GST_MATROSKA_ID_TARGETTRACKUID, mpad->track->uid); gst_ebml_write_master_finish (ebml, master_targets); gst_tag_list_foreach (mpad->tags, gst_matroska_mux_write_simple_tag, ebml); |