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
5f3a081b
Commit
5f3a081b
authored
Nov 28, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avi: Spin out the logic to position to the next non-interleaved stream
Signed-off-by:
Luca Barbato
<
lu_zero@gentoo.org
>
parent
cb49bb10
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
72 additions
and
62 deletions
+72
-62
avidec.c
libavformat/avidec.c
+72
-62
No files found.
libavformat/avidec.c
View file @
5f3a081b
...
...
@@ -1094,21 +1094,9 @@ start_sync:
return
AVERROR_EOF
;
}
static
int
avi_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
static
int
ni_prepare_read
(
AVFormatContext
*
s
)
{
AVIContext
*
avi
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
int
err
;
if
(
CONFIG_DV_DEMUXER
&&
avi
->
dv_demux
)
{
int
size
=
avpriv_dv_get_packet
(
avi
->
dv_demux
,
pkt
);
if
(
size
>=
0
)
return
size
;
else
goto
resync
;
}
if
(
avi
->
non_interleaved
)
{
int
best_stream_index
=
0
;
AVStream
*
best_st
=
NULL
;
AVIStream
*
best_ast
;
...
...
@@ -1171,6 +1159,28 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt)
best_ast
->
packet_size
=
best_ast
->
remaining
=
best_st
->
index_entries
[
i
].
size
;
}
return
0
;
}
static
int
avi_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
AVIContext
*
avi
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
int
err
;
if
(
CONFIG_DV_DEMUXER
&&
avi
->
dv_demux
)
{
int
size
=
avpriv_dv_get_packet
(
avi
->
dv_demux
,
pkt
);
if
(
size
>=
0
)
return
size
;
else
goto
resync
;
}
if
(
avi
->
non_interleaved
)
{
err
=
ni_prepare_read
(
s
);
if
(
err
<
0
)
return
err
;
}
resync:
...
...
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