summaryrefslogtreecommitdiff
path: root/libavformat/bintext.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-14 01:19:56 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-14 07:22:31 +0100
commit055cda8acccad3e7414132cddf0dc4e22b1ae00b (patch)
tree2701fb28fcb20094b5c0f851dbb980110ea31fda /libavformat/bintext.c
parentf3c47e4100993040bab67285d373e54325259d9a (diff)
Rename remaining get_byte to avio_r8.
Diffstat (limited to 'libavformat/bintext.c')
-rw-r--r--libavformat/bintext.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index 538c0aff57..7f99d013a8 100644
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -69,13 +69,13 @@ static int next_tag_read(AVFormatContext *avctx, uint64_t *fsize)
return -1;
if (memcmp(buf, next_magic, sizeof(next_magic)))
return -1;
- if (get_byte(pb) != 0x01)
+ if (avio_r8(pb) != 0x01)
return -1;
*fsize -= 256;
#define GET_EFI2_META(name,size) \
- len = get_byte(pb); \
+ len = avio_r8(pb); \
if (len < 1 || len > size) \
return -1; \
if (avio_read(pb, buf, size) == size && *buf) { \
@@ -181,9 +181,9 @@ static int xbin_read_header(AVFormatContext *s,
url_fskip(pb, 5);
st->codec->width = get_le16(pb)<<3;
st->codec->height = get_le16(pb);
- fontheight = get_byte(pb);
+ fontheight = avio_r8(pb);
st->codec->height *= fontheight;
- flags = get_byte(pb);
+ flags = avio_r8(pb);
st->codec->extradata_size = 2;
if ((flags & BINTEXT_PALETTE))
@@ -218,7 +218,7 @@ static int adf_read_header(AVFormatContext *s,
AVIOContext *pb = s->pb;
AVStream *st;
- if (get_byte(pb) != 1)
+ if (avio_r8(pb) != 1)
return AVERROR_INVALIDDATA;
st = init_stream(s, ap);