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
89a4527c
Commit
89a4527c
authored
Nov 24, 2002
by
Sigmund Augdal Helberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix to allow absolute entries in m3u/asx files
parent
d88917bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
modules/demux/m3u.c
modules/demux/m3u.c
+10
-11
No files found.
modules/demux/m3u.c
View file @
89a4527c
...
...
@@ -2,7 +2,7 @@
* m3u.c: a meta demux to parse m3u and asx playlists
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: m3u.c,v 1.
5 2002/11/24 01:29:56
sigmunau Exp $
* $Id: m3u.c,v 1.
6 2002/11/24 13:02:13
sigmunau Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -245,24 +245,23 @@ static int Demux ( input_thread_t *p_input )
/* Check if the line has an absolute or relative path */
psz_name
=
psz_bol
;
msg_Dbg
(
p_input
,
"this is the current item: <%s>"
,
psz_name
);
while
(
*
psz_name
&&
strncmp
(
psz_name
,
"://"
,
sizeof
(
"://"
)
-
1
)
)
{
psz_name
++
;
}
if
(
!*
psz_name
)
if
(
!*
psz_name
&&
*
psz_bol
!=
'/'
)
{
/* the line doesn't specify a protocol name.
* If this line doesn't begin with a '/' then assume the path
* is relative to the path of the m3u file. */
char
*
psz_path
=
strdup
(
p_input
->
psz_name
);
psz_name
=
strrchr
(
psz_path
,
'/'
);
if
(
psz_name
)
*
psz_name
=
'\0'
;
else
*
psz_path
=
'\0'
;
psz_name
=
malloc
(
strlen
(
psz_path
)
+
strlen
(
psz_bol
)
+
2
);
sprintf
(
psz_name
,
"%s/%s"
,
psz_path
,
psz_bol
);
free
(
psz_path
);
char
*
psz_path
=
strdup
(
p_input
->
psz_name
);
psz_name
=
strrchr
(
psz_path
,
'/'
);
if
(
psz_name
)
*
psz_name
=
'\0'
;
else
*
psz_path
=
'\0'
;
psz_name
=
malloc
(
strlen
(
psz_path
)
+
strlen
(
psz_bol
)
+
2
);
sprintf
(
psz_name
,
"%s/%s"
,
psz_path
,
psz_bol
);
free
(
psz_path
);
}
else
{
...
...
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