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/amr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/amr.c') diff --git a/libavformat/amr.c b/libavformat/amr.c index 6ab8b3c668..9c64d35716 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -82,7 +82,7 @@ static int amr_read_header(AVFormatContext *s, AVStream *st; uint8_t header[9]; - get_buffer(pb, header, 6); + avio_read(pb, header, 6); st = av_new_stream(s, 0); if (!st) @@ -91,7 +91,7 @@ static int amr_read_header(AVFormatContext *s, } if(memcmp(header,AMR_header,6)!=0) { - get_buffer(pb, header+6, 3); + avio_read(pb, header+6, 3); if(memcmp(header,AMRWB_header,9)!=0) { return -1; @@ -128,7 +128,7 @@ static int amr_read_packet(AVFormatContext *s, } //FIXME this is wrong, this should rather be in a AVParset - toc=get_byte(s->pb); + toc=avio_r8(s->pb); mode = (toc >> 3) & 0x0F; if (enc->codec_id == CODEC_ID_AMR_NB) @@ -157,7 +157,7 @@ static int amr_read_packet(AVFormatContext *s, pkt->pos= url_ftell(s->pb); pkt->data[0]=toc; pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320; - read = get_buffer(s->pb, pkt->data+1, size-1); + read = avio_read(s->pb, pkt->data+1, size-1); if (read != size-1) { -- cgit v1.2.3