Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
cbae8d3b
Commit
cbae8d3b
authored
Sep 02, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: use stream_vaControl() where applicable (fixes #9302)
parent
7e12de50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
modules/demux/ps.c
modules/demux/ps.c
+3
-3
modules/demux/ts.c
modules/demux/ts.c
+4
-4
src/input/demux.c
src/input/demux.c
+1
-1
No files found.
modules/demux/ps.c
View file @
cbae8d3b
...
...
@@ -542,13 +542,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
case
DEMUX_SET_TITLE
:
return
stream_Control
(
p_demux
->
s
,
STREAM_SET_TITLE
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_SET_TITLE
,
args
);
case
DEMUX_SET_SEEKPOINT
:
return
stream_Control
(
p_demux
->
s
,
STREAM_SET_SEEKPOINT
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_SET_SEEKPOINT
,
args
);
case
DEMUX_GET_META
:
return
stream_Control
(
p_demux
->
s
,
STREAM_GET_META
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_GET_META
,
args
);
case
DEMUX_GET_FPS
:
default:
...
...
modules/demux/ts.c
View file @
cbae8d3b
...
...
@@ -1201,13 +1201,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
case
DEMUX_SET_TITLE
:
return
stream_Control
(
p_demux
->
s
,
STREAM_SET_TITLE
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_SET_TITLE
,
args
);
case
DEMUX_SET_SEEKPOINT
:
return
stream_Control
(
p_demux
->
s
,
STREAM_SET_SEEKPOINT
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_SET_SEEKPOINT
,
args
);
case
DEMUX_GET_META
:
return
stream_Control
(
p_demux
->
s
,
STREAM_GET_META
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_GET_META
,
args
);
case
DEMUX_CAN_RECORD
:
pb_bool
=
(
bool
*
)
va_arg
(
args
,
bool
*
);
...
...
@@ -1223,7 +1223,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return
VLC_SUCCESS
;
case
DEMUX_GET_SIGNAL
:
return
stream_Control
(
p_demux
->
s
,
STREAM_GET_SIGNAL
,
args
);
return
stream_
va
Control
(
p_demux
->
s
,
STREAM_GET_SIGNAL
,
args
);
default:
return
VLC_EGENERIC
;
...
...
src/input/demux.c
View file @
cbae8d3b
...
...
@@ -312,7 +312,7 @@ int demux_vaControlHelper( stream_t *s,
return
VLC_EGENERIC
;
case
DEMUX_GET_META
:
return
stream_Control
(
s
,
STREAM_GET_META
,
args
);
return
stream_
va
Control
(
s
,
STREAM_GET_META
,
args
);
case
DEMUX_GET_PTS_DELAY
:
case
DEMUX_GET_FPS
:
...
...
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