diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 16:43:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-22 02:44:37 +0100 |
| commit | e63a362857d9807b23e65872598d782fa53bb6af (patch) | |
| tree | 7a21287e54bfbd2ec9c45bcb5a22e441e4992f2b /libavformat/spdifdec.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/spdifdec.c')
| -rw-r--r-- | libavformat/spdifdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index a1a62a116c..2fc567277f 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -170,13 +170,13 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) int pkt_size_bits, offset, ret; while (state != (AV_BSWAP16C(SYNCWORD1) << 16 | AV_BSWAP16C(SYNCWORD2))) { - state = (state << 8) | get_byte(pb); + state = (state << 8) | avio_r8(pb); if (url_feof(pb)) return AVERROR_EOF; } - data_type = get_le16(pb); - pkt_size_bits = get_le16(pb); + data_type = avio_rl16(pb); + pkt_size_bits = avio_rl16(pb); if (pkt_size_bits % 16) av_log_ask_for_sample(s, "Packet does not end to a 16-bit boundary."); @@ -187,7 +187,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->pos = url_ftell(pb) - BURST_HEADER_SIZE; - if (get_buffer(pb, pkt->data, pkt->size) < pkt->size) { + if (avio_read(pb, pkt->data, pkt->size) < pkt->size) { av_free_packet(pkt); return AVERROR_EOF; } |