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
71d32071
Commit
71d32071
authored
Aug 15, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get vout: use size_t for the counter
Internal counter is still int due to tab macros.
parent
cdc27ca5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
include/vlc_input.h
include/vlc_input.h
+2
-2
src/input/control.c
src/input/control.c
+1
-1
src/input/resource.c
src/input/resource.c
+8
-3
src/input/resource.h
src/input/resource.h
+1
-1
No files found.
include/vlc_input.h
View file @
71d32071
...
...
@@ -568,12 +568,12 @@ static inline int input_AddSubtitle( input_thread_t *p_input, const char *psz_ur
static
inline
vout_thread_t
*
input_GetVout
(
input_thread_t
*
p_input
)
{
vout_thread_t
**
pp_vout
,
*
p_vout
;
unsigned
i_vout
;
size_t
i_vout
;
if
(
input_Control
(
p_input
,
INPUT_GET_VOUTS
,
&
pp_vout
,
&
i_vout
)
)
return
NULL
;
for
(
unsigned
i
=
1
;
i
<
i_vout
;
i
++
)
for
(
size_t
i
=
1
;
i
<
i_vout
;
i
++
)
vlc_object_release
(
(
vlc_object_t
*
)(
pp_vout
[
i
])
);
p_vout
=
(
i_vout
>=
1
)
?
pp_vout
[
0
]
:
NULL
;
...
...
src/input/control.c
View file @
71d32071
...
...
@@ -427,7 +427,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
case
INPUT_GET_VOUTS
:
{
vout_thread_t
***
ppp_vout
=
(
vout_thread_t
***
)
va_arg
(
args
,
vout_thread_t
***
);
int
*
pi_vout
=
(
int
*
)
va_arg
(
args
,
int
*
);
size_t
*
pi_vout
=
va_arg
(
args
,
size_t
*
);
input_resource_HoldVouts
(
p_input
->
p
->
p_resource
,
ppp_vout
,
pi_vout
);
if
(
*
pi_vout
<=
0
)
...
...
src/input/resource.c
View file @
71d32071
...
...
@@ -288,7 +288,9 @@ static vout_thread_t *HoldVout( input_resource_t *p_resource )
return
p_vout
;
}
static
void
HoldVouts
(
input_resource_t
*
p_resource
,
vout_thread_t
***
ppp_vout
,
int
*
pi_vout
)
static
void
HoldVouts
(
input_resource_t
*
p_resource
,
vout_thread_t
***
ppp_vout
,
size_t
*
pi_vout
)
{
vout_thread_t
**
pp_vout
;
...
...
@@ -300,7 +302,7 @@ static void HoldVouts( input_resource_t *p_resource, vout_thread_t ***ppp_vout,
if
(
p_resource
->
i_vout
<=
0
)
goto
exit
;
pp_vout
=
calloc
(
p_resource
->
i_vout
,
sizeof
(
*
pp_vout
)
);
pp_vout
=
malloc
(
p_resource
->
i_vout
*
sizeof
(
*
pp_vout
)
);
if
(
!
pp_vout
)
goto
exit
;
...
...
@@ -460,10 +462,13 @@ vout_thread_t *input_resource_HoldVout( input_resource_t *p_resource )
{
return
HoldVout
(
p_resource
);
}
void
input_resource_HoldVouts
(
input_resource_t
*
p_resource
,
vout_thread_t
***
ppp_vout
,
int
*
pi_vout
)
void
input_resource_HoldVouts
(
input_resource_t
*
p_resource
,
vout_thread_t
***
ppp_vout
,
size_t
*
pi_vout
)
{
HoldVouts
(
p_resource
,
ppp_vout
,
pi_vout
);
}
void
input_resource_TerminateVout
(
input_resource_t
*
p_resource
)
{
input_resource_RequestVout
(
p_resource
,
NULL
,
NULL
,
false
);
...
...
src/input/resource.h
View file @
71d32071
...
...
@@ -81,7 +81,7 @@ vout_thread_t *input_resource_HoldVout( input_resource_t * );
*
* You must call vlc_object_release on all values returned (if non NULL).
*/
void
input_resource_HoldVouts
(
input_resource_t
*
,
vout_thread_t
***
,
in
t
*
);
void
input_resource_HoldVouts
(
input_resource_t
*
,
vout_thread_t
***
,
size_
t
*
);
#endif
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