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
cf4c5c9f
Commit
cf4c5c9f
authored
Aug 31, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
concat: fix handling of unknown sizes
parent
0e2573c8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
modules/access/concat.c
modules/access/concat.c
+12
-4
No files found.
modules/access/concat.c
View file @
cf4c5c9f
...
...
@@ -23,6 +23,7 @@
#endif
#include <assert.h>
#include <stdint.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
...
...
@@ -159,7 +160,7 @@ static int Seek(access_t *access, uint64_t position)
uint64_t
size
;
if
(
access_GetSize
(
a
,
&
size
))
size
=
0
;
break
;
if
(
position
-
access
->
info
.
i_pos
<
size
)
{
if
(
vlc_access_Seek
(
a
,
position
-
access
->
info
.
i_pos
))
...
...
@@ -196,6 +197,8 @@ static int Control(access_t *access, int query, va_list args)
*
va_arg
(
args
,
bool
*
)
=
sys
->
can_control_pace
;
break
;
case
ACCESS_GET_SIZE
:
if
(
sys
->
size
==
UINT64_MAX
)
return
VLC_EGENERIC
;
*
va_arg
(
args
,
uint64_t
*
)
=
sys
->
size
;
break
;
case
ACCESS_GET_PTS_DELAY
:
...
...
@@ -282,10 +285,15 @@ static int Open(vlc_object_t *obj)
access_Control
(
a
,
ACCESS_CAN_PAUSE
,
&
sys
->
can_pause
);
if
(
sys
->
can_control_pace
)
access_Control
(
a
,
ACCESS_CAN_CONTROL_PACE
,
&
sys
->
can_control_pace
);
if
(
sys
->
size
!=
UINT64_MAX
)
{
uint64_t
size
;
if
(
access_GetSize
(
a
,
&
size
)
==
0
)
if
(
access_GetSize
(
a
,
&
size
))
sys
->
size
=
UINT64_MAX
;
else
sys
->
size
+=
size
;
}
int64_t
caching
;
access_Control
(
a
,
ACCESS_GET_PTS_DELAY
,
&
caching
);
...
...
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