Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
George Kiagiadakis
gst-plugins-good
Commits
7456ee1e
Commit
7456ee1e
authored
Feb 22, 2016
by
Mark Nauwelaerts
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
matroska: remove confusing duplicate track uid field
parent
93cd4be8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
gst/matroska/matroska-ids.h
gst/matroska/matroska-ids.h
+0
-1
gst/matroska/matroska-mux.c
gst/matroska/matroska-mux.c
+3
-4
No files found.
gst/matroska/matroska-ids.h
View file @
7456ee1e
...
...
@@ -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
;
...
...
gst/matroska/matroska-mux.c
View file @
7456ee1e
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment