summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-14 00:36:45 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-14 07:22:30 +0100
commiteef3ea8c710d87da889e31e65b40b36cc7a2648e (patch)
tree2d8048e916d68051dcd30dbfc6bea140dd47087f /libavformat
parent73af8ea356011be169bfd1b046f7d86c10ea89cb (diff)
Rename remaining ByteIOContext to AVIOContext.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/act.c4
-rw-r--r--libavformat/bintext.c10
-rw-r--r--libavformat/bit.c2
-rw-r--r--libavformat/mxfdec.c2
4 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/act.c b/libavformat/act.c
index bbda1ae409..a2e8b9f8e1 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 2450d92d0e..6dfb960fb9 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 f0ffbe638a..39052380d9 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 d940649c6a..5180d21f86 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;