diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-20 11:04:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-20 19:05:47 +0100 |
| commit | 471fe57e1af2bb37055c93688671c9c79ef9b5cd (patch) | |
| tree | 7f44437fe6bd0654feaba193f323b442e60049f9 /libavformat/electronicarts.c | |
| parent | a8858ee11cf4f0ae22e0a9df57bec4ec5dd02f80 (diff) | |
| download | ffmpeg-471fe57e1af2bb37055c93688671c9c79ef9b5cd.tar.gz | |
avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
Diffstat (limited to 'libavformat/electronicarts.c')
| -rw-r--r-- | libavformat/electronicarts.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 5408a1f0de..0f4843d4e9 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -77,7 +77,7 @@ typedef struct EaDemuxContext { int num_samples; } EaDemuxContext; -static uint32_t read_arbitary(ByteIOContext *pb) { +static uint32_t read_arbitary(AVIOContext *pb) { uint8_t size, byte; int i; uint32_t word; @@ -102,7 +102,7 @@ static int process_audio_header_elements(AVFormatContext *s) { int inHeader = 1; EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int compression_type = -1, revision = -1, revision2 = -1; ea->bytes = 2; @@ -215,7 +215,7 @@ static int process_audio_header_elements(AVFormatContext *s) static int process_audio_header_eacs(AVFormatContext *s) { EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int compression_type; ea->sample_rate = ea->big_endian ? get_be32(pb) : get_le32(pb); @@ -247,7 +247,7 @@ static int process_audio_header_eacs(AVFormatContext *s) static int process_audio_header_sead(AVFormatContext *s) { EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; ea->sample_rate = get_le32(pb); ea->bytes = get_le32(pb); /* 1=8-bit, 2=16-bit */ @@ -260,7 +260,7 @@ static int process_audio_header_sead(AVFormatContext *s) static int process_video_header_mdec(AVFormatContext *s) { EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; url_fskip(pb, 4); ea->width = get_le16(pb); ea->height = get_le16(pb); @@ -272,7 +272,7 @@ static int process_video_header_mdec(AVFormatContext *s) static int process_video_header_vp6(AVFormatContext *s) { EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; url_fskip(pb, 16); ea->time_base.den = get_le32(pb); @@ -289,7 +289,7 @@ static int process_video_header_vp6(AVFormatContext *s) static int process_ea_header(AVFormatContext *s) { uint32_t blockid, size = 0; EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int i; for (i=0; i<5 && (!ea->audio_codec || !ea->video_codec); i++) { @@ -459,7 +459,7 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt) { EaDemuxContext *ea = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; int ret = 0; int packet_read = 0; unsigned int chunk_type, chunk_size; |