diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 18:43:01 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 04:44:37 +0300 |
commit | e63a362857d9807b23e65872598d782fa53bb6af (patch) | |
tree | 7a21287e54bfbd2ec9c45bcb5a22e441e4992f2b /libavformat/soxdec.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/soxdec.c')
-rw-r--r-- | libavformat/soxdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c index ca48b4370f..b66883441b 100644 --- a/libavformat/soxdec.c +++ b/libavformat/soxdec.c @@ -55,20 +55,20 @@ static int sox_read_header(AVFormatContext *s, st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - if (get_le32(pb) == SOX_TAG) { + if (avio_rl32(pb) == SOX_TAG) { st->codec->codec_id = CODEC_ID_PCM_S32LE; - header_size = get_le32(pb); + header_size = avio_rl32(pb); url_fskip(pb, 8); /* sample count */ - sample_rate = av_int2dbl(get_le64(pb)); - st->codec->channels = get_le32(pb); - comment_size = get_le32(pb); + sample_rate = av_int2dbl(avio_rl64(pb)); + st->codec->channels = avio_rl32(pb); + comment_size = avio_rl32(pb); } else { st->codec->codec_id = CODEC_ID_PCM_S32BE; - header_size = get_be32(pb); + header_size = avio_rb32(pb); url_fskip(pb, 8); /* sample count */ - sample_rate = av_int2dbl(get_be64(pb)); - st->codec->channels = get_be32(pb); - comment_size = get_be32(pb); + sample_rate = av_int2dbl(avio_rb64(pb)); + st->codec->channels = avio_rb32(pb); + comment_size = avio_rb32(pb); } if (comment_size > 0xFFFFFFFFU - SOX_FIXED_HDR - 4U) { @@ -95,7 +95,7 @@ static int sox_read_header(AVFormatContext *s, if (comment_size && comment_size < UINT_MAX) { char *comment = av_malloc(comment_size+1); - if (get_buffer(pb, comment, comment_size) != comment_size) { + if (avio_read(pb, comment, comment_size) != comment_size) { av_freep(&comment); return AVERROR(EIO); } |