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
02311b59
Commit
02311b59
authored
Jan 16, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed broken ES_OUT_GET_TS.
parent
1b7abb6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
19 deletions
+0
-19
include/vlc_es_out.h
include/vlc_es_out.h
+0
-4
src/input/es_out.c
src/input/es_out.c
+0
-11
src/input/es_out_timeshift.c
src/input/es_out_timeshift.c
+0
-4
No files found.
include/vlc_es_out.h
View file @
02311b59
...
...
@@ -68,10 +68,6 @@ enum es_out_query_e
ES_OUT_SET_GROUP_PCR
,
/* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
ES_OUT_RESET_PCR
,
/* no arg */
/* Timestamp handling, convert an input timestamp to a global clock one.
* (shouldn't have to be used by input plugins directly) */
ES_OUT_GET_TS
,
/* arg1=int64_t i_ts(microsecond!) (using default group 0), arg2=int64_t* converted i_ts */
/* Try not to use this one as it is a bit hacky */
ES_OUT_SET_ES_FMT
,
/* arg1= es_out_id_t* arg2=es_format_t* */
...
...
src/input/es_out.c
View file @
02311b59
...
...
@@ -2194,17 +2194,6 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
EsOutChangePosition
(
out
);
return
VLC_SUCCESS
;
case
ES_OUT_GET_TS
:
if
(
p_sys
->
p_pgrm
)
{
int64_t
i_ts
=
(
int64_t
)
va_arg
(
args
,
int64_t
);
int64_t
*
pi_ts
=
(
int64_t
*
)
va_arg
(
args
,
int64_t
*
);
*
pi_ts
=
input_clock_GetTS
(
p_sys
->
p_pgrm
->
p_clock
,
NULL
,
p_sys
->
p_input
->
i_pts_delay
,
i_ts
);
return
VLC_SUCCESS
;
}
return
VLC_EGENERIC
;
case
ES_OUT_SET_GROUP
:
{
int
j
;
...
...
src/input/es_out_timeshift.c
View file @
02311b59
...
...
@@ -582,10 +582,6 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
assert
(
0
);
return
VLC_EGENERIC
;
/* TODO ? or to remove ? */
case
ES_OUT_GET_TS
:
return
VLC_EGENERIC
;
/* Pass-through control */
case
ES_OUT_SET_ACTIVE
:
case
ES_OUT_SET_MODE
:
...
...
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