[FFmpeg-cvslog] oggdec: pass avformat context to ogg_reset()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  4 13:44:28 2012 +0200| [5f9f78dc9b8d400b7b2c44b67a6384787946f44e] | committer: Michael Niedermayer

oggdec: pass avformat context to ogg_reset()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f9f78dc9b8d400b7b2c44b67a6384787946f44e
---

 libavformat/oggdec.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 6a55f89..fc488da 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