[libav-commits] lavu: move internal define to the only places where it is used

Vittorio Giovara git at libav.org
Mon Nov 24 02:34:28 CET 2014


Module: libav
Branch: master
Commit: 277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2

Author:    Vittorio Giovara <vittorio.giovara at gmail.com>
Committer: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:      Fri Nov 21 12:57:43 2014 +0000

lavu: move internal define to the only places where it is used

---

 libavcodec/h263.h       |    1 +
 libavcodec/h264_cabac.c |    1 +
 libavutil/internal.h    |    4 ----
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index dbbe7ce..c5e3020 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 5a7cdf0..1e91626 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 aed9925..800680a 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



More information about the libav-commits mailing list