diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-04 13:44:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-04 14:40:21 +0200 |
| commit | 5f9f78dc9b8d400b7b2c44b67a6384787946f44e (patch) | |
| tree | bbc2b0c6e71e056890f573683d916d9caa7bf83e /libavformat/oggdec.c | |
| parent | babf2a34670e43004169ea8e78c6aff14a57d2c4 (diff) | |
| download | ffmpeg-5f9f78dc9b8d400b7b2c44b67a6384787946f44e.tar.gz | |
oggdec: pass avformat context to ogg_reset()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.c')
| -rw-r--r-- | libavformat/oggdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 6a55f89f97..fc488dad13 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -117,8 +117,9 @@ static int ogg_restore(AVFormatContext *s, int discard) return 0; } -static int ogg_reset(struct ogg *ogg) +static int ogg_reset(AVFormatContext *s) { + struct ogg *ogg = s->priv_data; int 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 pstart, psize; 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)) { if (i == stream_index) { @@ -680,7 +681,7 @@ static int64_t ogg_read_timestamp(AVFormatContext *s, int stream_index, if (pts != AV_NOPTS_VALUE) break; } - ogg_reset(ogg); + ogg_reset(s); return pts; } @@ -694,7 +695,7 @@ static int ogg_read_seek(AVFormatContext *s, int stream_index, av_assert0(stream_index < ogg->nstreams); // Ensure everything is reset even when seeking via // the generated index. - ogg_reset(ogg); + ogg_reset(s); // Try seeking to a keyframe first. If this fails (very possible), // av_seek_frame will fall back to ignoring keyframes |