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/sol.c | |
parent | f8bed30d8b176fa030f6737765338bb4a2bcabc9 (diff) | |
download | ffmpeg-b7effd4e8338f6ed5bda630ad7ed0809bf458648.tar.gz |
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/sol.c')
-rw-r--r-- | libavformat/sol.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/sol.c b/libavformat/sol.c index d688fde8b2..7ad894e304 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -93,15 +93,15 @@ static int sol_read_header(AVFormatContext *s, AVStream *st; /* check ".snd" header */ - magic = get_le16(pb); - tag = get_le32(pb); + magic = avio_rl16(pb); + tag = avio_rl32(pb); if (tag != MKTAG('S', 'O', 'L', 0)) return -1; - rate = get_le16(pb); - type = get_byte(pb); - size = get_le32(pb); + rate = avio_rl16(pb); + type = avio_r8(pb); + size = avio_rl32(pb); if (magic != 0x0B8D) - get_byte(pb); /* newer SOLs contain padding byte */ + avio_r8(pb); /* newer SOLs contain padding byte */ codec = sol_codec_id(magic, type); channels = sol_channels(magic, type); |