From fd085bc08203979c6d0e8a6ab031c7e19b57f7a1 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 4 Mar 2011 08:33:49 -0500 Subject: avio: fix fourcc if any character is >=0x80. Fixes issue 2638. --- libavformat/avio_internal.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavformat/avio_internal.h') diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 3b38990f56..279c7f60ff 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -42,6 +42,9 @@ int ffio_read_partial(AVIOContext *s, unsigned char *buf, int size); void ffio_fill(AVIOContext *s, int b, int count); -#define ffio_wfourcc(pb, str) avio_wl32(pb, MKTAG((str)[0], (str)[1], (str)[2], (str)[3])) +static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s) +{ + avio_wl32(pb, MKTAG(s[0], s[1], s[2], s[3])); +} #endif // AVFORMAT_AVIO_INTERNAL_H -- cgit v1.2.3