diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-04 08:33:49 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-05 02:29:24 +0100 |
| commit | a960576f20534589cc911395e71f6ee89255426f (patch) | |
| tree | 0c0576e4e52ef54e78e0db51c5e762786b5a0e29 | |
| parent | 7f1b1f3d7426332e2d9bb4cd828fec7f738704ce (diff) | |
| download | ffmpeg-a960576f20534589cc911395e71f6ee89255426f.tar.gz | |
avio: fix fourcc if any character is >=0x80.
Fixes issue 2638.
(cherry picked from commit fd085bc08203979c6d0e8a6ab031c7e19b57f7a1)
| -rw-r--r-- | 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 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 |