mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-17 23:17:41 +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> (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648)
This commit is contained in:

committed by
Michael Niedermayer

parent
6a786b15c3
commit
e63a362857
@ -88,7 +88,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx, AVFormatParameters *ap)
|
||||
|
||||
/* Some files start with "connected\r\n\r\n".
|
||||
* So skip until we find the first byte of struct size */
|
||||
while(get_byte(pb) != HEADER_SIZE && !url_feof(pb));
|
||||
while(avio_r8(pb) != HEADER_SIZE && !url_feof(pb));
|
||||
|
||||
if(url_feof(pb)) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not find valid start.");
|
||||
@ -107,11 +107,11 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
|
||||
url_fskip(pb, 1); /* one byte has been read ahead */
|
||||
url_fskip(pb, 2);
|
||||
url_fskip(pb, 2);
|
||||
keyframe = get_le16(pb);
|
||||
size = get_le32(pb);
|
||||
keyframe = avio_rl16(pb);
|
||||
size = avio_rl32(pb);
|
||||
url_fskip(pb, 4);
|
||||
url_fskip(pb, 4);
|
||||
timestamp = get_le32(pb);
|
||||
timestamp = avio_rl32(pb);
|
||||
|
||||
if(!size || av_get_packet(pb, pkt, size) != size)
|
||||
return -1;
|
||||
|
Reference in New Issue
Block a user