mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-06 07:40:00 +08:00
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>
This commit is contained in:

committed by
Ronald S. Bultje

parent
f8bed30d8b
commit
b7effd4e83
@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user