Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
a03e58ee
Commit
a03e58ee
authored
Nov 02, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed ES_OUT_SET_DEFAULT name (added ES_).
parent
c2f9cc44
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
include/vlc_es_out.h
include/vlc_es_out.h
+1
-1
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/matroska_segment.cpp
+1
-1
src/input/es_out.c
src/input/es_out.c
+1
-1
src/input/input.c
src/input/input.c
+1
-1
No files found.
include/vlc_es_out.h
View file @
a03e58ee
...
@@ -58,7 +58,7 @@ enum es_out_query_e
...
@@ -58,7 +58,7 @@ enum es_out_query_e
ES_OUT_RESTART_ES
,
/* arg1= es_out_id_t* */
ES_OUT_RESTART_ES
,
/* arg1= es_out_id_t* */
/* set 'default' tag on ES (copied across from container) */
/* set 'default' tag on ES (copied across from container) */
ES_OUT_SET_
DEFAULT
,
/* arg1= es_out_id_t*
*/
ES_OUT_SET_
ES_DEFAULT
,
/* arg1= es_out_id_t*
*/
/* force selection/unselection of the ES (bypass current mode) */
/* force selection/unselection of the ES (bypass current mode) */
ES_OUT_SET_ES_STATE
,
/* arg1= es_out_id_t* arg2=bool */
ES_OUT_SET_ES_STATE
,
/* arg1= es_out_id_t* arg2=bool */
...
...
modules/demux/mkv/matroska_segment.cpp
View file @
a03e58ee
...
@@ -1094,7 +1094,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
...
@@ -1094,7 +1094,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
if
(
tracks
[
i_track
]
->
b_default
)
if
(
tracks
[
i_track
]
->
b_default
)
{
{
es_out_Control
(
sys
.
demuxer
.
out
,
es_out_Control
(
sys
.
demuxer
.
out
,
ES_OUT_SET_DEFAULT
,
ES_OUT_SET_
ES_
DEFAULT
,
tracks
[
i_track
]
->
p_es
);
tracks
[
i_track
]
->
p_es
);
}
}
}
}
...
...
src/input/es_out.c
View file @
a03e58ee
...
@@ -2100,7 +2100,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
...
@@ -2100,7 +2100,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
case
ES_OUT_SET_DEFAULT
:
case
ES_OUT_SET_
ES_
DEFAULT
:
{
{
es
=
(
es_out_id_t
*
)
va_arg
(
args
,
es_out_id_t
*
);
es
=
(
es_out_id_t
*
)
va_arg
(
args
,
es_out_id_t
*
);
...
...
src/input/input.c
View file @
a03e58ee
...
@@ -3112,7 +3112,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
...
@@ -3112,7 +3112,7 @@ static void SubtitleAdd( input_thread_t *p_input, char *psz_subtitle, bool b_for
input_EsOutLock
(
p_input
->
p
->
p_es_out
);
input_EsOutLock
(
p_input
->
p
->
p_es_out
);
es_out_id_t
*
p_es
=
input_EsOutGetFromID
(
p_input
->
p
->
p_es_out
,
i_id
);
es_out_id_t
*
p_es
=
input_EsOutGetFromID
(
p_input
->
p
->
p_es_out
,
i_id
);
es_out_Control
(
p_input
->
p
->
p_es_out
,
ES_OUT_SET_DEFAULT
,
p_es
);
es_out_Control
(
p_input
->
p
->
p_es_out
,
ES_OUT_SET_
ES_
DEFAULT
,
p_es
);
es_out_Control
(
p_input
->
p
->
p_es_out
,
ES_OUT_SET_ES
,
p_es
);
es_out_Control
(
p_input
->
p
->
p_es_out
,
ES_OUT_SET_ES
,
p_es
);
input_EsOutUnlock
(
p_input
->
p
->
p_es_out
);
input_EsOutUnlock
(
p_input
->
p
->
p_es_out
);
}
}
...
...
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