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/vc1test.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/vc1test.c')
| -rw-r--r-- | libavformat/vc1test.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index 0be6ec3325..838dd43b5f 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -49,8 +49,8 @@ static int vc1t_read_header(AVFormatContext *s, int frames; uint32_t fps; - frames = get_le24(pb); - if(get_byte(pb) != 0xC5 || get_le32(pb) != 4) + frames = avio_rl24(pb); + if(avio_r8(pb) != 0xC5 || avio_rl32(pb) != 4) return -1; /* init video codec */ @@ -63,13 +63,13 @@ static int vc1t_read_header(AVFormatContext *s, st->codec->extradata = av_malloc(VC1_EXTRADATA_SIZE); st->codec->extradata_size = VC1_EXTRADATA_SIZE; - get_buffer(pb, st->codec->extradata, VC1_EXTRADATA_SIZE); - st->codec->height = get_le32(pb); - st->codec->width = get_le32(pb); - if(get_le32(pb) != 0xC) + avio_read(pb, st->codec->extradata, VC1_EXTRADATA_SIZE); + st->codec->height = avio_rl32(pb); + st->codec->width = avio_rl32(pb); + if(avio_rl32(pb) != 0xC) return -1; url_fskip(pb, 8); - fps = get_le32(pb); + fps = avio_rl32(pb); if(fps == 0xFFFFFFFF) av_set_pts_info(st, 32, 1, 1000); else{ @@ -95,10 +95,10 @@ static int vc1t_read_packet(AVFormatContext *s, if(url_feof(pb)) return AVERROR(EIO); - frame_size = get_le24(pb); - if(get_byte(pb) & 0x80) + frame_size = avio_rl24(pb); + if(avio_r8(pb) & 0x80) keyframe = 1; - pts = get_le32(pb); + pts = avio_rl32(pb); if(av_get_packet(pb, pkt, frame_size) < 0) return AVERROR(EIO); if(s->streams[0]->time_base.den == 1000) |