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/isom.c | |
| parent | f8bed30d8b176fa030f6737765338bb4a2bcabc9 (diff) | |
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/isom.c')
| -rw-r--r-- | libavformat/isom.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 6b1be10f25..8534cb8898 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -346,7 +346,7 @@ int ff_mp4_read_descr_len(AVIOContext *pb) int len = 0; int count = 4; while (count--) { - int c = get_byte(pb); + int c = avio_r8(pb); len = (len << 7) | (c & 0x7f); if (!(c & 0x80)) break; @@ -357,7 +357,7 @@ int ff_mp4_read_descr_len(AVIOContext *pb) int ff_mp4_read_descr(AVFormatContext *fc, AVIOContext *pb, int *tag) { int len; - *tag = get_byte(pb); + *tag = avio_r8(pb); len = ff_mp4_read_descr_len(pb); av_dlog(fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len); return len; @@ -375,11 +375,11 @@ static const AVCodecTag mp4_audio_types[] = { int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb) { int len, tag; - int object_type_id = get_byte(pb); - get_byte(pb); /* stream type */ - get_be24(pb); /* buffer size db */ - get_be32(pb); /* max bitrate */ - get_be32(pb); /* avg bitrate */ + int object_type_id = avio_r8(pb); + avio_r8(pb); /* stream type */ + avio_rb24(pb); /* buffer size db */ + avio_rb32(pb); /* max bitrate */ + avio_rb32(pb); /* avg bitrate */ st->codec->codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id); av_dlog(fc, "esds object type id 0x%02x\n", object_type_id); @@ -392,7 +392,7 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); if (!st->codec->extradata) return AVERROR(ENOMEM); - get_buffer(pb, st->codec->extradata, len); + avio_read(pb, st->codec->extradata, len); st->codec->extradata_size = len; if (st->codec->codec_id == CODEC_ID_AAC) { MPEG4AudioConfig cfg; |