From b7effd4e8338f6ed5bda630ad7ed0809bf458648 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 Feb 2011 16:43:01 +0100 Subject: avio: avio_ prefixes for get_* functions In the name of consistency: get_byte -> avio_r8 get_ -> avio_r get_buffer -> avio_read get_partial_buffer will be made private later get_strz is left out becase I want to change it later to return something useful. Signed-off-by: Ronald S. Bultje --- libavformat/bfi.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'libavformat/bfi.c') diff --git a/libavformat/bfi.c b/libavformat/bfi.c index 40724b336d..7313e7b337 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -66,24 +66,24 @@ static int bfi_read_header(AVFormatContext * s, AVFormatParameters * ap) /* Set the total number of frames. */ url_fskip(pb, 8); - chunk_header = get_le32(pb); - bfi->nframes = get_le32(pb); - get_le32(pb); - get_le32(pb); - get_le32(pb); - fps = get_le32(pb); + chunk_header = avio_rl32(pb); + bfi->nframes = avio_rl32(pb); + avio_rl32(pb); + avio_rl32(pb); + avio_rl32(pb); + fps = avio_rl32(pb); url_fskip(pb, 12); - vstream->codec->width = get_le32(pb); - vstream->codec->height = get_le32(pb); + vstream->codec->width = avio_rl32(pb); + vstream->codec->height = avio_rl32(pb); /*Load the palette to extradata */ url_fskip(pb, 8); vstream->codec->extradata = av_malloc(768); vstream->codec->extradata_size = 768; - get_buffer(pb, vstream->codec->extradata, + avio_read(pb, vstream->codec->extradata, vstream->codec->extradata_size); - astream->codec->sample_rate = get_le32(pb); + astream->codec->sample_rate = avio_rl32(pb); /* Set up the video codec... */ av_set_pts_info(vstream, 32, 1, fps); @@ -119,14 +119,14 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt) while(state != MKTAG('S','A','V','I')){ if (url_feof(pb)) return AVERROR(EIO); - state = 256*state + get_byte(pb); + state = 256*state + avio_r8(pb); } /* Now that the chunk's location is confirmed, we proceed... */ - chunk_size = get_le32(pb); - get_le32(pb); - audio_offset = get_le32(pb); - get_le32(pb); - video_offset = get_le32(pb); + chunk_size = avio_rl32(pb); + avio_rl32(pb); + audio_offset = avio_rl32(pb); + avio_rl32(pb); + video_offset = avio_rl32(pb); audio_size = video_offset - audio_offset; bfi->video_size = chunk_size - video_offset; -- cgit v1.2.3