aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-19 16:46:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-19 18:40:49 +0200
commit157dd527008cf3569853dd75dc808021a6a1f62e (patch)
treeebd453a0c681d301407f3dd16a51e79a5acdef64
parent23614d09d51178a0be368d5fdf39a6f014f46988 (diff)
downloadffmpeg-157dd527008cf3569853dd75dc808021a6a1f62e.tar.gz
avcodec/dpxenc: implement write16/32 as functions
Fixes undefined behavior and segfault Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8edc17b639c4ac47913c467107ffb43c67c64890) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dpxenc.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index aca745bb58..76aa0cc473 100644
--- a/libavcodec/dpxenc.c
+++ b/libavcodec/dpxenc.c
@@ -75,17 +75,20 @@ static av_cold int encode_init(AVCodecContext *avctx)
return 0;
}
-#define write16(p, value) \
-do { \
- if (s->big_endian) AV_WB16(p, value); \
- else AV_WL16(p, value); \
-} while(0)
+static av_always_inline void write16_internal(int big_endian, void *p, int value)
+{
+ if (big_endian) AV_WB16(p, value);
+ else AV_WL16(p, value);
+}
+
+static av_always_inline void write32_internal(int big_endian, void *p, int value)
+{
+ if (big_endian) AV_WB32(p, value);
+ else AV_WL32(p, value);
+}
-#define write32(p, value) \
-do { \
- if (s->big_endian) AV_WB32(p, value); \
- else AV_WL32(p, value); \
-} while(0)
+#define write16(p, value) write16_internal(s->big_endian, p, value)
+#define write32(p, value) write32_internal(s->big_endian, p, value)
static void encode_rgb48_10bit(AVCodecContext *avctx, const AVPicture *pic, uint8_t *dst)
{