From 41d8555f72e3bc60cf93af2a1a4786b452fd2736 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Thu, 3 Mar 2011 13:51:55 +0100 Subject: avio: add avio_get_str() Signed-off-by: Ronald S. Bultje --- libavformat/aviobuf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'libavformat/aviobuf.c') diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 3f3721c58b..5b2f9c0fe7 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -705,6 +705,23 @@ int ff_get_line(AVIOContext *s, char *buf, int maxlen) return i; } +int avio_get_str(AVIOContext *s, int maxlen, char *buf, int buflen) +{ + int i; + + // reserve 1 byte for terminating 0 + buflen = FFMIN(buflen - 1, maxlen); + for (i = 0; i < buflen; i++) + if (!(buf[i] = avio_r8(s))) + return i + 1; + if (buflen) + buf[i] = 0; + for (; i < maxlen; i++) + if (!avio_r8(s)) + return i + 1; + return maxlen; +} + #define GET_STR16(type, read) \ int avio_get_str16 ##type(AVIOContext *pb, int maxlen, char *buf, int buflen)\ {\ -- cgit v1.2.3