diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 16:43:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 02:44:37 +0100 |
| commit | e63a362857d9807b23e65872598d782fa53bb6af (patch) | |
| tree | 7a21287e54bfbd2ec9c45bcb5a22e441e4992f2b /libavformat/amr.c | |
| parent | 6a786b15c34765ec00be3cd808dafbb041fd5881 (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>
(cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
Diffstat (limited to 'libavformat/amr.c')
| -rw-r--r-- | libavformat/amr.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |