summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2014-11-21 12:57:43 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-11-24 01:30:14 +0000
commit277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2 (patch)
treeec83a3ecbff83b8d571d7d2d9b5c81e9b3015670
parent065923b0781b06a2604f69f4e2c2407b7750a854 (diff)
lavu: move internal define to the only places where it is used
-rw-r--r--libavcodec/h263.h1
-rw-r--r--libavcodec/h264_cabac.c1
-rw-r--r--libavutil/internal.h4
3 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index dbbe7cead8..c5e30205bf 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -29,6 +29,7 @@
#if !FF_API_ASPECT_EXTENDED
#define FF_ASPECT_EXTENDED 15
#endif
+#define INT_BIT (CHAR_BIT * sizeof(int))
// The defines below define the number of bits that are read at once for
// reading vlc values. Changing these may improve speed and data cache needs
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 5a7cdf0adf..1e9162621c 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -26,6 +26,7 @@
*/
#define CABAC(h) 1
+#define INT_BIT (CHAR_BIT * sizeof(int))
#include "libavutil/attributes.h"
#include "libavutil/timer.h"
diff --git a/libavutil/internal.h b/libavutil/internal.h
index aed9925e7c..800680a7f2 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -77,10 +77,6 @@
# define FF_ENABLE_DEPRECATION_WARNINGS
#endif
-#ifndef INT_BIT
-# define INT_BIT (CHAR_BIT * sizeof(int))
-#endif
-
// Some broken preprocessors need a second expansion
// to be forced to tokenize __VA_ARGS__
#define E1(x) x