Browse Source

Rename remaining ByteIOContext to AVIOContext.

tags/n0.9
Clément Bœsch 13 years ago
parent
commit
eef3ea8c71
4 changed files with 9 additions and 9 deletions
  1. +2
    -2
      libavformat/act.c
  2. +5
    -5
      libavformat/bintext.c
  3. +1
    -1
      libavformat/bit.c
  4. +1
    -1
      libavformat/mxfdec.c

+ 2
- 2
libavformat/act.c View File

@@ -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;



+ 5
- 5
libavformat/bintext.c View File

@@ -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;



+ 1
- 1
libavformat/bit.c View File

@@ -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;



+ 1
- 1
libavformat/mxfdec.c View File

@@ -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;


Loading…
Cancel
Save