[FFmpeg-devel] [PATCH 01/11] Rename remaining ByteIOContext to AVIOContext.

[Clément Bœsch]

---
 libavformat/act.c     |    4 ++--
 libavformat/bintext.c |   10 +++++-----
 libavformat/bit.c     |    2 +-
 libavformat/mxfdec.c  |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavformat/act.c b/libavformat/act.c
index bbda1ae..a2e8b9f 100644
--- a/libavformat/act.c
+++ b/libavformat/act.c
@@ -63,7 +63,7 @@ static int read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     ACTContext* ctx = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     int size;
     AVStream* st;
 
@@ -111,7 +111,7 @@ static int read_packet(AVFormatContext *s,
                           AVPacket *pkt)
 {
     ACTContext *ctx = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     int ret;
     int frame_size=s->streams[0]->codec->sample_rate==8000?10:22;
 
diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index 2450d92..6dfb960 100644
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -59,7 +59,7 @@ static const uint8_t next_magic[]={
 
 static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize)
 {
-    ByteIOContext *pb = avctx->pb;
+    AVIOContext *pb = avctx->pb;
     char buf[36];
     int len;
     uint64_t start_pos = url_fsize(pb) - 256;
@@ -126,7 +126,7 @@ static int bintext_read_header(AVFormatContext *s,
                                AVFormatParameters *ap)
 {
     BinDemuxContext *bin = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
 
     AVStream *st = init_stream(s, ap);
     if (!st)
@@ -171,7 +171,7 @@ static int xbin_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     BinDemuxContext *bin = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     char fontheight, flags;
 
     AVStream *st = init_stream(s, ap);
@@ -215,7 +215,7 @@ static int adf_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     BinDemuxContext *bin = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     AVStream *st;
 
     if (get_byte(pb) != 1)
@@ -272,7 +272,7 @@ static int idf_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
     BinDemuxContext *bin = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     AVStream *st;
     int got_width = 0;
 
diff --git a/libavformat/bit.c b/libavformat/bit.c
index f0ffbe6..3905238 100644
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -127,7 +127,7 @@ static int write_header(AVFormatContext *s)
 
 static int write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     GetBitContext gb;
     int i;
 
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index d940649..5180d21 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -406,7 +406,7 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb, int tag, int size, U
     return 0;
 }
 
-static int mxf_read_partition_pack(void *arg, ByteIOContext *pb, int tag, int size, UID uid)
+static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size, UID uid)
 {
     MXFContext *mxf = arg;
     MXFPartition *partition;
-- 
1.7.7.3