[FFmpeg-cvslog] avio: fix fourcc if any character is >=0x80.

Ronald S. Bultje git
Sat Mar 5 03:28:22 CET 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri Mar  4 08:33:49 2011 -0500| [a960576f20534589cc911395e71f6ee89255426f] | committer: Michael Niedermayer

avio: fix fourcc if any character is >=0x80.

Fixes issue 2638.
(cherry picked from commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a960576f20534589cc911395e71f6ee89255426f
---

 libavformat/avio_internal.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 3b38990..279c7f6 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




More information about the ffmpeg-cvslog mailing list