From e63a362857d9807b23e65872598d782fa53bb6af 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 (cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648) --- libavformat/msnwc_tcp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/msnwc_tcp.c') diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c index 4408c18601..3033c23a91 100644 --- a/libavformat/msnwc_tcp.c +++ b/libavformat/msnwc_tcp.c @@ -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; -- cgit v1.2.1