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>

1 files changed, 9 insertions, 9 deletions

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 5bc4ce64dc..a71638ee13 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -80,7 +80,7 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
     MPADecodeHeader c;
     int vbrtag_size = 0;
 
-    v = get_be32(s->pb);
+    v = avio_rb32(s->pb);
     if(ff_mpa_check_header(v) < 0)
       return -1;
 
@@ -91,25 +91,25 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
 
     /* Check for Xing / Info tag */
     url_fseek(s->pb, xing_offtbl[c.lsf == 1][c.nb_channels == 1], SEEK_CUR);
-    v = get_be32(s->pb);
+    v = avio_rb32(s->pb);
     if(v == MKBETAG('X', 'i', 'n', 'g') || v == MKBETAG('I', 'n', 'f', 'o')) {
-        v = get_be32(s->pb);
+        v = avio_rb32(s->pb);
         if(v & 0x1)
-            frames = get_be32(s->pb);
+            frames = avio_rb32(s->pb);
         if(v & 0x2)
-            size = get_be32(s->pb);
+            size = avio_rb32(s->pb);
     }
 
     /* Check for VBRI tag (always 32 bytes after end of mpegaudio header) */
     url_fseek(s->pb, base + 4 + 32, SEEK_SET);
-    v = get_be32(s->pb);
+    v = avio_rb32(s->pb);
     if(v == MKBETAG('V', 'B', 'R', 'I')) {
         /* Check tag version */
-        if(get_be16(s->pb) == 1) {
+        if(avio_rb16(s->pb) == 1) {
             /* skip delay and quality */
             url_fseek(s->pb, 4, SEEK_CUR);
-            frames = get_be32(s->pb);
-            size = get_be32(s->pb);
+            frames = avio_rb32(s->pb);
+            size = avio_rb32(s->pb);
         }
     }