mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

matroska: remove confusing duplicate track uid field

Browse source
This commit is contained in:
Mark Nauwelaerts 2016-02-22 13:25:51 +01:00
parent 93cd4be8d5
commit 7456ee1e1b
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/matroska/matroska-ids.h
View file

@ -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;

7
gst/matroska/matroska-mux.c
View file

@ -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);