[FFmpeg-cvslog] Factorize CHECK/SUINT code

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Feb 20 19:34:54 2017 +0100| [4614bf2caf67a89c2d833b3368f325eab54582bc] | committer: Michael Niedermayer

Factorize CHECK/SUINT code

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/flacdsp.h   | 10 ----------
 libavcodec/mpegaudio.h |  8 --------
 libavutil/internal.h   | 10 ++++++++++
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h
index 31417f8..7bb0dd0 100644
--- a/libavcodec/flacdsp.h
+++ b/libavcodec/flacdsp.h
@@ -23,16 +23,6 @@
 #include "libavutil/internal.h"
 #include "libavutil/samplefmt.h"
 
-// For debuging we use signed operations so overflows can be detected (by ubsan)
-// For production we use unsigned so there are no undefined operations
-#ifdef CHECKED
-#define SUINT   int
-#define SUINT32 int32_t
-#else
-#define SUINT   unsigned
-#define SUINT32 uint32_t
-#endif
-
 typedef struct FLACDSPContext {
     void (*decorrelate[4])(uint8_t **out, int32_t **in, int channels,
                            int len, int shift);
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index fcded7a..74590a8 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -59,14 +59,6 @@
 
 #define FIX(a)   ((int)((a) * FRAC_ONE))
 
-#ifdef CHECKED
-#define SUINT   int
-#define SUINT32 int32_t
-#else
-#define SUINT   unsigned
-#define SUINT32 uint32_t
-#endif
-
 #if USE_FLOATS
 #   define INTFLOAT float
 #   define SUINTFLOAT float
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 4d1b3e2..7780a9a 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -262,6 +262,16 @@ void avpriv_request_sample(void *avc,
 #   define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
 #endif
 
+// For debuging we use signed operations so overflows can be detected (by ubsan)
+// For production we use unsigned so there are no undefined operations
+#ifdef CHECKED
+#define SUINT   int
+#define SUINT32 int32_t
+#else
+#define SUINT   unsigned
+#define SUINT32 uint32_t
+#endif
+
 /**
  * Clip and convert a double value into the long long amin-amax range.
  * This function is needed because conversion of floating point to integers when