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
727cb1a4
Commit
727cb1a4
authored
Nov 05, 2010
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hls' of git.m2x.eu:vlc into hls
parents
bf89ad9f
154cfa6b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
include/vlc_fs.h
include/vlc_fs.h
+9
-0
modules/stream_filter/httplive.c
modules/stream_filter/httplive.c
+1
-9
No files found.
include/vlc_fs.h
View file @
727cb1a4
...
@@ -46,6 +46,15 @@ VLC_EXPORT( int, vlc_rename, ( const char *oldpath, const char *newpath ) );
...
@@ -46,6 +46,15 @@ VLC_EXPORT( int, vlc_rename, ( const char *oldpath, const char *newpath ) );
#if defined( WIN32 ) && !defined( UNDER_CE )
#if defined( WIN32 ) && !defined( UNDER_CE )
# define stat _stati64
# define stat _stati64
static
inline
void
vlc_rewinddir
(
DIR
*
dir
)
{
_WDIR
*
wdir
=
*
(
_WDIR
**
)
dir
;
_wrewinddir
(
wdir
);
}
# undef rewinddir
# define rewinddir vlc_rewinddir
#endif
#endif
VLC_EXPORT
(
int
,
vlc_stat
,
(
const
char
*
filename
,
struct
stat
*
buf
)
);
VLC_EXPORT
(
int
,
vlc_stat
,
(
const
char
*
filename
,
struct
stat
*
buf
)
);
...
...
modules/stream_filter/httplive.c
View file @
727cb1a4
...
@@ -923,12 +923,8 @@ static void* hls_Thread(vlc_object_t *p_this)
...
@@ -923,12 +923,8 @@ static void* hls_Thread(vlc_object_t *p_this)
static
int
Prefetch
(
stream_t
*
s
,
int
*
current
)
static
int
Prefetch
(
stream_t
*
s
,
int
*
current
)
{
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
int
current
;
again:
hls_stream_t
*
hls
=
hls_Get
(
p_sys
->
hls_stream
,
current
);
current
=
p_sys
->
current
;
hls_stream_t
*
hls
=
hls_Get
(
p_sys
->
hls_stream
,
p_sys
->
current
);
if
(
hls
==
NULL
)
if
(
hls
==
NULL
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -939,10 +935,6 @@ again:
...
@@ -939,10 +935,6 @@ again:
if
(
Download
(
s
,
hls
,
segment
,
current
)
!=
VLC_SUCCESS
)
if
(
Download
(
s
,
hls
,
segment
,
current
)
!=
VLC_SUCCESS
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
/* Bandwidth changed? */
if
(
current
!=
p_sys
->
current
)
goto
again
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
...
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