Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
f1d4df64
Commit
f1d4df64
authored
Nov 10, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Constify es_out_Add es_format_t* argument.
parent
a8498883
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
include/vlc_es_out.h
include/vlc_es_out.h
+2
-2
src/input/es_out.c
src/input/es_out.c
+10
-10
No files found.
include/vlc_es_out.h
View file @
f1d4df64
...
...
@@ -100,7 +100,7 @@ enum es_out_query_e
struct
es_out_t
{
es_out_id_t
*
(
*
pf_add
)
(
es_out_t
*
,
es_format_t
*
);
es_out_id_t
*
(
*
pf_add
)
(
es_out_t
*
,
const
es_format_t
*
);
int
(
*
pf_send
)
(
es_out_t
*
,
es_out_id_t
*
,
block_t
*
);
void
(
*
pf_del
)
(
es_out_t
*
,
es_out_id_t
*
);
int
(
*
pf_control
)(
es_out_t
*
,
int
i_query
,
va_list
);
...
...
@@ -112,7 +112,7 @@ struct es_out_t
};
LIBVLC_USED
static
inline
es_out_id_t
*
es_out_Add
(
es_out_t
*
out
,
es_format_t
*
fmt
)
static
inline
es_out_id_t
*
es_out_Add
(
es_out_t
*
out
,
const
es_format_t
*
fmt
)
{
return
out
->
pf_add
(
out
,
fmt
);
}
...
...
src/input/es_out.c
View file @
f1d4df64
...
...
@@ -157,7 +157,7 @@ struct es_out_sys_t
sout_instance_t
*
p_sout_record
;
};
static
es_out_id_t
*
EsOutAdd
(
es_out_t
*
,
es_format_t
*
);
static
es_out_id_t
*
EsOutAdd
(
es_out_t
*
,
const
es_format_t
*
);
static
int
EsOutSend
(
es_out_t
*
,
es_out_id_t
*
,
block_t
*
);
static
void
EsOutDel
(
es_out_t
*
,
es_out_id_t
*
);
static
int
EsOutControl
(
es_out_t
*
,
int
i_query
,
va_list
);
...
...
@@ -1279,7 +1279,7 @@ static void EsOutProgramEpg( es_out_t *out, int i_group, vlc_epg_t *p_epg )
/* EsOutAdd:
* Add an es_out
*/
static
es_out_id_t
*
EsOutAdd
(
es_out_t
*
out
,
es_format_t
*
fmt
)
static
es_out_id_t
*
EsOutAdd
(
es_out_t
*
out
,
const
es_format_t
*
fmt
)
{
es_out_sys_t
*
p_sys
=
out
->
p_sys
;
input_thread_t
*
p_input
=
p_sys
->
p_input
;
...
...
@@ -1318,13 +1318,13 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
p_pgrm
->
i_es
++
;
/* Set up ES */
if
(
fmt
->
i_id
<
0
)
fmt
->
i_id
=
out
->
p_sys
->
i_id
;
es
->
i_id
=
fmt
->
i_id
;
es
->
p_pgrm
=
p_pgrm
;
es_format_Copy
(
&
es
->
fmt
,
fmt
);
if
(
es
->
fmt
.
i_id
<
0
)
es
->
fmt
.
i_id
=
out
->
p_sys
->
i_id
;
es
->
i_id
=
fmt
->
i_id
;
switch
(
fmt
->
i_cat
)
switch
(
es
->
fmt
.
i_cat
)
{
case
AUDIO_ES
:
{
...
...
@@ -1355,7 +1355,7 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
case
VIDEO_ES
:
es
->
i_channel
=
p_sys
->
i_video
;
if
(
fmt
->
video
.
i_frame_rate
&&
fmt
->
video
.
i_frame_rate_base
)
if
(
es
->
fmt
.
video
.
i_frame_rate
&&
es
->
fmt
.
video
.
i_frame_rate_base
)
vlc_ureduce
(
&
es
->
fmt
.
video
.
i_frame_rate
,
&
es
->
fmt
.
video
.
i_frame_rate_base
,
fmt
->
video
.
i_frame_rate
,
...
...
@@ -1370,8 +1370,8 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
es
->
i_channel
=
0
;
break
;
}
es
->
psz_language
=
LanguageGetName
(
fmt
->
psz_language
);
/* remember so we only need to do it once */
es
->
psz_language_code
=
LanguageGetCode
(
fmt
->
psz_language
);
es
->
psz_language
=
LanguageGetName
(
es
->
fmt
.
psz_language
);
/* remember so we only need to do it once */
es
->
psz_language_code
=
LanguageGetCode
(
es
->
fmt
.
psz_language
);
es
->
p_dec
=
NULL
;
es
->
p_dec_record
=
NULL
;
for
(
i
=
0
;
i
<
4
;
i
++
)
...
...
@@ -1387,7 +1387,7 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
TAB_APPEND
(
out
->
p_sys
->
i_es
,
out
->
p_sys
->
es
,
es
);
p_sys
->
i_id
++
;
/* always incremented */
switch
(
fmt
->
i_cat
)
switch
(
es
->
fmt
.
i_cat
)
{
case
AUDIO_ES
:
p_sys
->
i_audio
++
;
...
...
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