Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
ce4c05bb
Commit
ce4c05bb
authored
Jul 10, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use strdup on a string created by asprintf (useless).
parent
46f77d8a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
18 deletions
+4
-18
modules/demux/playlist/sgimb.c
modules/demux/playlist/sgimb.c
+4
-18
No files found.
modules/demux/playlist/sgimb.c
View file @
ce4c05bb
...
...
@@ -325,25 +325,16 @@ static int Demux ( demux_t *p_demux )
{
/* Definetly schedules multicast session */
/* We don't care if it's live or not */
char
*
temp
;
asprintf
(
&
temp
,
"udp://@"
"%s:%i"
,
p_sys
->
psz_mcast_ip
,
p_sys
->
i_mcast_port
);
free
(
p_sys
->
psz_uri
);
p_sys
->
psz_uri
=
strdup
(
temp
);
free
(
temp
);
asprintf
(
&
p_sys
->
psz_uri
,
"udp://@"
"%s:%i"
,
p_sys
->
psz_mcast_ip
,
p_sys
->
i_mcast_port
);
}
if
(
p_sys
->
psz_uri
==
NULL
)
{
if
(
p_sys
->
psz_server
&&
p_sys
->
psz_location
)
{
char
*
temp
;
asprintf
(
&
temp
,
"rtsp://"
"%s:%i%s"
,
asprintf
(
&
p_sys
->
psz_uri
,
"rtsp://"
"%s:%i%s"
,
p_sys
->
psz_server
,
p_sys
->
i_port
>
0
?
p_sys
->
i_port
:
554
,
p_sys
->
psz_location
);
p_sys
->
psz_uri
=
strdup
(
temp
);
free
(
temp
);
}
}
...
...
@@ -351,20 +342,15 @@ static int Demux ( demux_t *p_demux )
{
/* It's definetly a simulcasted scheduled stream */
/* We don't care if it's live or not */
char
*
temp
;
if
(
p_sys
->
psz_uri
==
NULL
)
{
msg_Err
(
p_demux
,
"no URI was found"
);
return
-
1
;
}
asprintf
(
&
temp
,
"%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE"
,
p_sys
->
psz_uri
,
p_sys
->
i_sid
);
free
(
p_sys
->
psz_uri
);
p_sys
->
psz_uri
=
strdup
(
temp
);
free
(
temp
);
asprintf
(
&
p_sys
->
psz_uri
,
"%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE"
,
p_sys
->
psz_uri
,
p_sys
->
i_sid
);
}
p_child
=
input_ItemNewWithType
(
VLC_OBJECT
(
p_demux
),
p_sys
->
psz_uri
,
...
...
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