From b7effd4e8338f6ed5bda630ad7ed0809bf458648 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 Feb 2011 16:43:01 +0100 Subject: avio: avio_ prefixes for get_* functions In the name of consistency: get_byte -> avio_r8 get_ -> avio_r 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 --- libavformat/soxdec.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libavformat/soxdec.c') 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); } -- cgit v1.2.3