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, 11 insertions, 11 deletions

diff --git a/libavformat/ivfdec.c b/libavformat/ivfdec.c
index 94b8b82a41..af3fe19e22 100644
--- a/libavformat/ivfdec.c
+++ b/libavformat/ivfdec.c
@@ -36,9 +36,9 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
     AVStream *st;
     AVRational time_base;
 
-    get_le32(s->pb); // DKIF
-    get_le16(s->pb); // version
-    get_le16(s->pb); // header size
+    avio_rl32(s->pb); // DKIF
+    avio_rl16(s->pb); // version
+    avio_rl16(s->pb); // header size
 
     st = av_new_stream(s, 0);
     if (!st)
@@ -46,13 +46,13 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 
 
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_tag  = get_le32(s->pb);
+    st->codec->codec_tag  = avio_rl32(s->pb);
     st->codec->codec_id   = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag);
-    st->codec->width      = get_le16(s->pb);
-    st->codec->height     = get_le16(s->pb);
-    time_base.den         = get_le32(s->pb);
-    time_base.num         = get_le32(s->pb);
-    st->duration          = get_le64(s->pb);
+    st->codec->width      = avio_rl16(s->pb);
+    st->codec->height     = avio_rl16(s->pb);
+    time_base.den         = avio_rl32(s->pb);
+    time_base.num         = avio_rl32(s->pb);
+    st->duration          = avio_rl64(s->pb);
 
     st->need_parsing      = AVSTREAM_PARSE_HEADERS;
 
@@ -68,8 +68,8 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 
 static int read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    int ret, size = get_le32(s->pb);
-    int64_t   pts = get_le64(s->pb);
+    int ret, size = avio_rl32(s->pb);
+    int64_t   pts = avio_rl64(s->pb);
 
     ret = av_get_packet(s->pb, pkt, size);
     pkt->stream_index = 0;