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/ncdec.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/ncdec.c')
| -rw-r--r-- | libavformat/ncdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c index 1472d15ca4..9f62f22ffb 100644 --- a/libavformat/ncdec.c +++ b/libavformat/ncdec.c @@ -68,11 +68,11 @@ static int nc_read_packet(AVFormatContext *s, AVPacket *pkt) while (state != NC_VIDEO_FLAG) { if (url_feof(s->pb)) return AVERROR(EIO); - state = (state<<8) + get_byte(s->pb); + state = (state<<8) + avio_r8(s->pb); } - get_byte(s->pb); - size = get_le16(s->pb); + avio_r8(s->pb); + size = avio_rl16(s->pb); url_fskip(s->pb, 9); if (size == 0) { |