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
37c38fd3
Commit
37c38fd3
authored
Oct 24, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: remove INPUT_GET_VIDEO_FPS control
parent
1bfa2016
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
15 deletions
+0
-15
include/vlc_input.h
include/vlc_input.h
+0
-3
src/input/control.c
src/input/control.c
+0
-8
src/input/input.c
src/input/input.c
+0
-4
No files found.
include/vlc_input.h
View file @
37c38fd3
...
...
@@ -441,9 +441,6 @@ enum input_query_e
INPUT_DEL_INFO
,
/* arg1= char* arg2= char* res=can fail */
INPUT_SET_NAME
,
/* arg1= char* res=can fail */
/* Input properties */
INPUT_GET_VIDEO_FPS
,
/* arg1= double * res=can fail */
/* bookmarks */
INPUT_GET_BOOKMARK
,
/* arg1= seekpoint_t * res=can fail */
INPUT_GET_BOOKMARKS
,
/* arg1= seekpoint_t *** arg2= int * res=can fail */
...
...
src/input/control.c
View file @
37c38fd3
...
...
@@ -427,14 +427,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
return
VLC_SUCCESS
;
}
case
INPUT_GET_VIDEO_FPS
:
pf
=
(
double
*
)
va_arg
(
args
,
double
*
);
vlc_mutex_lock
(
&
p_input
->
p
->
p_item
->
lock
);
*
pf
=
p_input
->
p
->
f_fps
;
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
return
VLC_SUCCESS
;
case
INPUT_ADD_SLAVE
:
psz
=
(
char
*
)
va_arg
(
args
,
char
*
);
if
(
psz
&&
*
psz
)
...
...
src/input/input.c
View file @
37c38fd3
...
...
@@ -2273,11 +2273,7 @@ static input_source_t *InputSourceNew( input_thread_t *p_input,
}
if
(
!
demux_Control
(
in
->
p_demux
,
DEMUX_GET_FPS
,
&
f_fps
)
&&
f_fps
>
0
.
0
)
{
vlc_mutex_lock
(
&
p_input
->
p
->
p_item
->
lock
);
p_input
->
p
->
f_fps
=
f_fps
;
vlc_mutex_unlock
(
&
p_input
->
p
->
p_item
->
lock
);
}
if
(
var_GetInteger
(
p_input
,
"clock-synchro"
)
!=
-
1
)
in
->
b_can_pace_control
=
!
var_GetInteger
(
p_input
,
"clock-synchro"
);
...
...
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