Do not access s->gb directly in functions that have a local copy of that
authorRonald S. Bultje <rsbultje@gmail.com>
Sat, 6 Dec 2008 18:35:52 +0000 (18:35 +0000)
committerRonald S. Bultje <rsbultje@gmail.com>
Sat, 6 Dec 2008 18:35:52 +0000 (18:35 +0000)
variable. See "[PATCH] asf.c: don't access AVFormatContext->pb" thread on
ML.

Originally committed as revision 16023 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/asf.c

index 695cfec..0024c2c 100644 (file)
@@ -567,7 +567,7 @@ static int asf_get_packet(AVFormatContext *s)
     int rsize = 8;
     int c, d, e, off;
 
-    off= (url_ftell(s->pb) - s->data_offset) % asf->packet_size + 3;
+    off= (url_ftell(pb) - s->data_offset) % asf->packet_size + 3;
 
     c=d=e=-1;
     while(off-- > 0){
@@ -723,7 +723,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
             /* fail safe */
             url_fskip(pb, ret);
 
-            asf->packet_pos= url_ftell(s->pb);
+            asf->packet_pos= url_ftell(pb);
             if (asf->data_object_size != (uint64_t)-1 &&
                 (asf->packet_pos - asf->data_object_offset >= asf->data_object_size))
                 return AVERROR(EIO); /* Do not exceed the size of the data object */