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
2dd113c6
Commit
2dd113c6
authored
Aug 13, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
input: Fix asprintf usage.
parent
5b15b230
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
+15
-6
src/input/es_out.c
src/input/es_out.c
+15
-6
No files found.
src/input/es_out.c
View file @
2dd113c6
...
...
@@ -669,9 +669,15 @@ static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm )
{
char
*
psz
=
NULL
;
if
(
p_pgrm
->
psz_name
)
asprintf
(
&
psz
,
_
(
"%s [%s %d]"
),
p_pgrm
->
psz_name
,
_
(
"Program"
),
p_pgrm
->
i_id
);
{
if
(
asprintf
(
&
psz
,
_
(
"%s [%s %d]"
),
p_pgrm
->
psz_name
,
_
(
"Program"
),
p_pgrm
->
i_id
)
==
-
1
)
psz
=
NULL
;
}
else
asprintf
(
&
psz
,
"%s %d"
,
_
(
"Program"
),
p_pgrm
->
i_id
);
{
if
(
asprintf
(
&
psz
,
"%s %d"
,
_
(
"Program"
),
p_pgrm
->
i_id
)
==
-
1
)
psz
=
NULL
;
}
return
psz
;
}
...
...
@@ -735,9 +741,11 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
if
(
psz_provider
&&
*
psz_provider
)
{
asprintf
(
&
text
.
psz_string
,
"%s [%s]"
,
psz_title
,
psz_provider
);
var_Change
(
p_input
,
"program"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
free
(
text
.
psz_string
);
if
(
asprintf
(
&
text
.
psz_string
,
"%s [%s]"
,
psz_title
,
psz_provider
)
!=
-
1
)
{
var_Change
(
p_input
,
"program"
,
VLC_VAR_ADDCHOICE
,
&
val
,
&
text
);
free
(
text
.
psz_string
);
}
}
else
{
...
...
@@ -2035,7 +2043,8 @@ static void EsOutAddInfo( es_out_t *out, es_out_id_t *es )
lldiv_t
div
;
/* Add stream info */
asprintf
(
&
psz_cat
,
_
(
"Stream %d"
),
out
->
p_sys
->
i_id
-
1
);
if
(
asprintf
(
&
psz_cat
,
_
(
"Stream %d"
),
out
->
p_sys
->
i_id
-
1
)
==
-
1
)
return
;
input_Control
(
p_input
,
INPUT_ADD_INFO
,
psz_cat
,
_
(
"Codec"
),
"%.4s"
,
(
char
*
)
&
fmt
->
i_codec
);
...
...
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