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
5f9f78dc
Commit
5f9f78dc
authored
May 04, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oggdec: pass avformat context to ogg_reset()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
babf2a34
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
oggdec.c
libavformat/oggdec.c
+5
-4
No files found.
libavformat/oggdec.c
View file @
5f9f78dc
...
@@ -117,8 +117,9 @@ static int ogg_restore(AVFormatContext *s, int discard)
...
@@ -117,8 +117,9 @@ static int ogg_restore(AVFormatContext *s, int discard)
return
0
;
return
0
;
}
}
static
int
ogg_reset
(
struct
ogg
*
ogg
)
static
int
ogg_reset
(
AVFormatContext
*
s
)
{
{
struct
ogg
*
ogg
=
s
->
priv_data
;
int
i
;
int
i
;
for
(
i
=
0
;
i
<
ogg
->
nstreams
;
i
++
){
for
(
i
=
0
;
i
<
ogg
->
nstreams
;
i
++
){
...
@@ -659,7 +660,7 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
...
@@ -659,7 +660,7 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
int
i
=
-
1
;
int
i
=
-
1
;
int
pstart
,
psize
;
int
pstart
,
psize
;
avio_seek
(
bc
,
*
pos_arg
,
SEEK_SET
);
avio_seek
(
bc
,
*
pos_arg
,
SEEK_SET
);
ogg_reset
(
ogg
);
ogg_reset
(
s
);
while
(
avio_tell
(
bc
)
<
pos_limit
&&
!
ogg_packet
(
s
,
&
i
,
&
pstart
,
&
psize
,
pos_arg
))
{
while
(
avio_tell
(
bc
)
<
pos_limit
&&
!
ogg_packet
(
s
,
&
i
,
&
pstart
,
&
psize
,
pos_arg
))
{
if
(
i
==
stream_index
)
{
if
(
i
==
stream_index
)
{
...
@@ -680,7 +681,7 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
...
@@ -680,7 +681,7 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index,
if
(
pts
!=
AV_NOPTS_VALUE
)
if
(
pts
!=
AV_NOPTS_VALUE
)
break
;
break
;
}
}
ogg_reset
(
ogg
);
ogg_reset
(
s
);
return
pts
;
return
pts
;
}
}
...
@@ -694,7 +695,7 @@ static int ogg_read_seek(AVFormatContext *s, int stream_index,
...
@@ -694,7 +695,7 @@ static int ogg_read_seek(AVFormatContext *s, int stream_index,
av_assert0
(
stream_index
<
ogg
->
nstreams
);
av_assert0
(
stream_index
<
ogg
->
nstreams
);
// Ensure everything is reset even when seeking via
// Ensure everything is reset even when seeking via
// the generated index.
// the generated index.
ogg_reset
(
ogg
);
ogg_reset
(
s
);
// Try seeking to a keyframe first. If this fails (very possible),
// Try seeking to a keyframe first. If this fails (very possible),
// av_seek_frame will fall back to ignoring keyframes
// av_seek_frame will fall back to ignoring keyframes
...
...
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