Use dynamically allocated ByteIOContext in AVFormatContext

patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

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

1 files changed, 8 insertions, 8 deletions

diff --git a/libavformat/amr.c b/libavformat/amr.c
index c0a8707b6a..d8c5399e3f 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -33,7 +33,7 @@ static const char AMRWB_header [] = "#!AMR-WB\n";
 #ifdef CONFIG_MUXERS
 static int amr_write_header(AVFormatContext *s)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVCodecContext *enc = s->streams[0]->codec;
 
     s->priv_data = NULL;
@@ -56,8 +56,8 @@ static int amr_write_header(AVFormatContext *s)
 
 static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    put_buffer(&s->pb, pkt->data, pkt->size);
-    put_flush_packet(&s->pb);
+    put_buffer(s->pb, pkt->data, pkt->size);
+    put_flush_packet(s->pb);
     return 0;
 }
 #endif /* CONFIG_MUXERS */
@@ -78,7 +78,7 @@ static int amr_probe(AVProbeData *p)
 static int amr_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
     uint8_t header[9];
 
@@ -120,13 +120,13 @@ static int amr_read_packet(AVFormatContext *s,
     AVCodecContext *enc = s->streams[0]->codec;
     int read, size = 0, toc, mode;
 
-    if (url_feof(&s->pb))
+    if (url_feof(s->pb))
     {
         return AVERROR(EIO);
     }
 
 //FIXME this is wrong, this should rather be in a AVParset
-    toc=get_byte(&s->pb);
+    toc=get_byte(s->pb);
     mode = (toc >> 3) & 0x0F;
 
     if (enc->codec_id == CODEC_ID_AMR_NB)
@@ -152,10 +152,10 @@ static int amr_read_packet(AVFormatContext *s,
     }
 
     pkt->stream_index = 0;
-    pkt->pos= url_ftell(&s->pb);
+    pkt->pos= url_ftell(s->pb);
     pkt->data[0]=toc;
     pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320;
-    read = get_buffer(&s->pb, pkt->data+1, size-1);
+    read = get_buffer(s->pb, pkt->data+1, size-1);
 
     if (read != size-1)
     {