diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-12-06 18:35:52 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-12-06 18:35:52 +0000 |
| commit | 022f0b7c0160c69983262773121439affd7d8219 (patch) | |
| tree | b613360ca5cad996604688f4c36532d08b2a0880 /libavformat/asf.c | |
| parent | 2ceccf045c295b9a507d6e3be7710c63f51c0529 (diff) | |
Do not access s->gb directly in functions that have a local copy of that
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
Diffstat (limited to 'libavformat/asf.c')
| -rw-r--r-- | libavformat/asf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index 695cfeca75..0024c2c144 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -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 */ |