diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 16:43:01 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-21 11:23:22 -0500 |
| commit | b7effd4e8338f6ed5bda630ad7ed0809bf458648 (patch) | |
| tree | 53c878f6dd48c313a9bcde1855c2b4e009822c9e /libavformat/ingenientdec.c | |
| parent | f8bed30d8b176fa030f6737765338bb4a2bcabc9 (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>
Diffstat (limited to 'libavformat/ingenientdec.c')
| -rw-r--r-- | libavformat/ingenientdec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c index 79587b5192..dbb3f3bfd2 100644 --- a/libavformat/ingenientdec.c +++ b/libavformat/ingenientdec.c @@ -27,18 +27,18 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret, size, w, h, unk1, unk2; - if (get_le32(s->pb) != MKTAG('M', 'J', 'P', 'G')) + if (avio_rl32(s->pb) != MKTAG('M', 'J', 'P', 'G')) return AVERROR(EIO); // FIXME - size = get_le32(s->pb); + size = avio_rl32(s->pb); - w = get_le16(s->pb); - h = get_le16(s->pb); + w = avio_rl16(s->pb); + h = avio_rl16(s->pb); url_fskip(s->pb, 8); // zero + size (padded?) url_fskip(s->pb, 2); - unk1 = get_le16(s->pb); - unk2 = get_le16(s->pb); + unk1 = avio_rl16(s->pb); + unk2 = avio_rl16(s->pb); url_fskip(s->pb, 22); // ASCII timestamp av_log(s, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n", @@ -49,7 +49,7 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->pos = url_ftell(s->pb); pkt->stream_index = 0; - ret = get_buffer(s->pb, pkt->data, size); + ret = avio_read(s->pb, pkt->data, size); if (ret < 0) { av_free_packet(pkt); return ret; |