[FFmpeg-cvslog] avcodec/dpxenc: implement write16/32 as functions

2015-08-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer michae...@gmx.at | Fri Jun 
19 16:46:06 2015 +0200| [e588252a429ca60408813191350891680e848dfd] | committer: 
Michael Niedermayer

avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 8edc17b639c4ac47913c467107ffb43c67c64890)

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dpxenc.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index aca745b..76aa0cc 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);
+elseAV_WL16(p, value);
+}
+
+static av_always_inline void write32_internal(int big_endian, void *p, int 
value)
+{
+if (big_endian) AV_WB32(p, value);
+elseAV_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)
 {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dpxenc: implement write16/32 as functions

2015-07-27 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer michae...@gmx.at | Fri Jun 
19 16:46:06 2015 +0200| [fc0df14de1a6f75be52b77e067608d833a68c05c] | committer: 
Michael Niedermayer

avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 8edc17b639c4ac47913c467107ffb43c67c64890)

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dpxenc.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index aca745b..76aa0cc 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);
+elseAV_WL16(p, value);
+}
+
+static av_always_inline void write32_internal(int big_endian, void *p, int 
value)
+{
+if (big_endian) AV_WB32(p, value);
+elseAV_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)
 {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dpxenc: implement write16/32 as functions

2015-07-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer michae...@gmx.at | Fri Jun 
19 16:46:06 2015 +0200| [47e950848599d3196860b1984a43ca6fd5429ecc] | committer: 
Michael Niedermayer

avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 8edc17b639c4ac47913c467107ffb43c67c64890)

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dpxenc.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index aca745b..76aa0cc 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);
+elseAV_WL16(p, value);
+}
+
+static av_always_inline void write32_internal(int big_endian, void *p, int 
value)
+{
+if (big_endian) AV_WB32(p, value);
+elseAV_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)
 {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dpxenc: implement write16/32 as functions

2015-06-19 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Fri Jun 19 
16:46:06 2015 +0200| [8edc17b639c4ac47913c467107ffb43c67c64890] | committer: 
Michael Niedermayer

avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dpxenc.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index aca745b..76aa0cc 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);
+elseAV_WL16(p, value);
+}
+
+static av_always_inline void write32_internal(int big_endian, void *p, int 
value)
+{
+if (big_endian) AV_WB32(p, value);
+elseAV_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)
 {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/dpxenc: implement write16/32 as functions

2015-06-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer michae...@gmx.at | Fri Jun 
19 16:46:06 2015 +0200| [157dd527008cf3569853dd75dc808021a6a1f62e] | committer: 
Michael Niedermayer

avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 8edc17b639c4ac47913c467107ffb43c67c64890)

Signed-off-by: Michael Niedermayer michae...@gmx.at

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

 libavcodec/dpxenc.c |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index aca745b..76aa0cc 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);
+elseAV_WL16(p, value);
+}
+
+static av_always_inline void write32_internal(int big_endian, void *p, int 
value)
+{
+if (big_endian) AV_WB32(p, value);
+elseAV_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)
 {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog