virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

oggdec: pass avformat context to ogg_reset()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-05-04 13:44:28 +02:00
parent babf2a3467
commit 5f9f78dc9b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/oggdec.c
View File

@@ -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,
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,
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,
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