Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7f42276a
Commit
7f42276a
authored
Dec 13, 2018
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/concatdec: always allow seeking to start
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
f9e94784
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
concatdec.c
libavformat/concatdec.c
+7
-2
No files found.
libavformat/concatdec.c
View file @
7f42276a
...
...
@@ -692,6 +692,13 @@ static int real_seek(AVFormatContext *avf, int stream,
left
=
0
;
right
=
cat
->
nb_files
;
/* Always support seek to start */
if
(
ts
<=
0
)
right
=
1
;
else
if
(
!
cat
->
seekable
)
return
AVERROR
(
ESPIPE
);
/* XXX: can we use it? */
while
(
right
-
left
>
1
)
{
int
mid
=
(
left
+
right
)
/
2
;
if
(
ts
<
cat
->
files
[
mid
].
start_time
)
...
...
@@ -728,8 +735,6 @@ static int concat_seek(AVFormatContext *avf, int stream,
AVFormatContext
*
cur_avf_saved
=
cat
->
avf
;
int
ret
;
if
(
!
cat
->
seekable
)
return
AVERROR
(
ESPIPE
);
/* XXX: can we use it? */
if
(
flags
&
(
AVSEEK_FLAG_BYTE
|
AVSEEK_FLAG_FRAME
))
return
AVERROR
(
ENOSYS
);
cat
->
avf
=
NULL
;
...
...
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