diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 16:43:01 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-21 11:23:22 -0500 |
| commit | b7effd4e8338f6ed5bda630ad7ed0809bf458648 (patch) | |
| tree | 53c878f6dd48c313a9bcde1855c2b4e009822c9e /libavformat/apc.c | |
| parent | f8bed30d8b176fa030f6737765338bb4a2bcabc9 (diff) | |
| download | ffmpeg-b7effd4e8338f6ed5bda630ad7ed0809bf458648.tar.gz | |
avio: avio_ prefixes for get_* functions
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
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 <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/apc.c')
| -rw-r--r-- | libavformat/apc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/apc.c b/libavformat/apc.c index 7641d9f0d1..bf93fc1522 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -35,9 +35,9 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap) AVIOContext *pb = s->pb; AVStream *st; - get_le32(pb); /* CRYO */ - get_le32(pb); /* _APC */ - get_le32(pb); /* 1.20 */ + avio_rl32(pb); /* CRYO */ + avio_rl32(pb); /* _APC */ + avio_rl32(pb); /* 1.20 */ st = av_new_stream(s, 0); if (!st) @@ -46,8 +46,8 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; - get_le32(pb); /* number of samples */ - st->codec->sample_rate = get_le32(pb); + avio_rl32(pb); /* number of samples */ + st->codec->sample_rate = avio_rl32(pb); st->codec->extradata_size = 2 * 4; st->codec->extradata = av_malloc(st->codec->extradata_size + @@ -56,10 +56,10 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap) return AVERROR(ENOMEM); /* initial predictor values for adpcm decoder */ - get_buffer(pb, st->codec->extradata, 2 * 4); + avio_read(pb, st->codec->extradata, 2 * 4); st->codec->channels = 1; - if (get_le32(pb)) + if (avio_rl32(pb)) st->codec->channels = 2; st->codec->bits_per_coded_sample = 4; |