cosmetics: simplify #includes

git-svn-id: svn://svn.videolan.org/x264/trunk@403 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/cabac.c b/common/cabac.c
index 79ba5cf364c172a26d48b46651d9dd9a069e3db8..50e09ab447c19c5573778b62e1c7ed37bedc5f57 100644 (file)
--- a/common/cabac.c
+++ b/common/cabac.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 

diff --git a/common/common.c b/common/common.c
index 2f7b73fd2f456b13fda4c8df2f285b71b30d1ceb..f309dc319fbfd656a229ce16508753880a0ba9c6 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>

diff --git a/common/common.h b/common/common.h
index f5ab1d6af3302284bcfc12bc0896fce8df5325e2..25ee7777650347265677e83f557bda16e8cc50e8 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -30,6 +30,7 @@
 #include <inttypes.h>
 #endif
 #include <stdarg.h>
+#include <stdlib.h>
 
 #ifdef _MSC_VER
 #define snprintf _snprintf

diff --git a/common/cpu.c b/common/cpu.c
index 7a8bc4fe17f71f2384f0f930358049323916d018..be05806d061aa18fe3cb1b25ae7f113134feef15 100644 (file)
--- a/common/cpu.c
+++ b/common/cpu.c
@@ -21,17 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-#include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
-#include "x264.h"
-#include "cpu.h"
+#include "common.h"
 
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
 extern int  x264_cpu_cpuid_test( void );

diff --git a/common/csp.c b/common/csp.c
index dbd990f2ea942a08c2927cce88d9289a9ce4f457..420b4c7d0ae92e352f6e19c9516b4afafba8b4ad 100644 (file)
--- a/common/csp.c
+++ b/common/csp.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/common/dct.c b/common/dct.c
index 012fac806bc62d78a4313fbbde4fd9348289fbd4..d23a80a031ea971b6ce42fe335819897d16015f6 100644 (file)
--- a/common/dct.c
+++ b/common/dct.c
@@ -21,16 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "x264.h"
-
 #include "common.h"
 #ifdef HAVE_MMXEXT
 #   include "i386/dct.h"

diff --git a/common/display-x11.c b/common/display-x11.c
index 3607618bd4d4c1bb909f3f65689ef0a1a6ea0dc8..f16db8b749da7f0b1daecc18a067e6928de622a3 100644 (file)
--- a/common/display-x11.c
+++ b/common/display-x11.c
@@ -23,7 +23,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "display.h"

diff --git a/common/frame.c b/common/frame.c
index ece66aeb0dcdc111c67da834e70316cc9a0dea01..098256b80148857353a0259c0984dd6be023453f 100644 (file)
--- a/common/frame.c
+++ b/common/frame.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/common/i386/mc-c.c b/common/i386/mc-c.c
index 521c86616248dcde37a96a39bebf904969ff0c2f..900ab7575833f22c26a87fb2217656dcb1312831 100644 (file)
--- a/common/i386/mc-c.c
+++ b/common/i386/mc-c.c
@@ -21,21 +21,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
 
-#include "x264.h"   /* DECLARE_ALIGNED */
-#include "common/pixel.h"
-#include "common/mc.h"
-#include "common/clip1.h"
-#include "mc.h"
+#include "common/common.h"
 
 /* NASM functions */
 extern void x264_pixel_avg_w4_mmxext( uint8_t *,  int, uint8_t *, int, uint8_t *, int, int );

diff --git a/common/macroblock.c b/common/macroblock.c
index a83b4961264ed11e7bef35a9197507cd30e46ed6..a2db154ad7cf877bdafa271ca9091dbebb868928 100644 (file)
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/common/mc.c b/common/mc.c
index 9ab307def0321b140390fd0bab7b222abaac2652..3087b40247bb3af2d3206ef302e254978621b679 100644 (file)
--- a/common/mc.c
+++ b/common/mc.c
@@ -21,22 +21,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
-
-#include "x264.h"
 
-#include "pixel.h"
-#include "mc.h"
+#include "common.h"
 #include "clip1.h"
-#include "frame.h"
 
 #ifdef HAVE_MMXEXT
 #include "i386/mc.h"

diff --git a/common/mdate.c b/common/mdate.c
index 2ce92b6580f3683d4ca21fef7d88e35a7a8904ff..c57becbd9ace027ca517dd7c1de6cb58ea0cd196 100644 (file)
--- a/common/mdate.c
+++ b/common/mdate.c
@@ -26,7 +26,6 @@
 #else
 #include <inttypes.h>
 #endif
-#include <stdlib.h>
 
 #if !(defined(_MSC_VER) || defined(__MINGW32__))
 #include <sys/time.h>

diff --git a/common/pixel.c b/common/pixel.c
index 58de6486ea6faac4883d8a41d2d3fde959e8b779..46c1d514f7465c7f3f2e6cf0b01d0ec9a99c66ad 100644 (file)
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -21,17 +21,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-#include <stdlib.h>
 #include <string.h>
-#include <stdarg.h>
 
-#include "x264.h"
-#include "pixel.h"
+#include "common.h"
 #include "clip1.h"
 
 #ifdef HAVE_MMXEXT

diff --git a/common/predict.c b/common/predict.c
index 659c696a23397f7052922adbcea3862d0f6fad5c..0e25af8c7c0e71eb4ba65375877caa0dc5b090c8 100644 (file)
--- a/common/predict.c
+++ b/common/predict.c
@@ -21,16 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-/* XXX predict4x4 are inspired from ffmpeg h264 decoder
- */
+/* predict4x4 are inspired from ffmpeg h264 decoder */
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-#include <stdlib.h>
-#include <stdarg.h>
 
 #include "common.h"
 

diff --git a/encoder/analyse.c b/encoder/analyse.c
index bb2035d276b2b0f94b786fe15f987ef9784a5182..5bacc502b3c187a2b788217030329f1303d141d6 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/encoder/cabac.c b/encoder/cabac.c
index a5bb58e4e9e7bb1acfaf1bc25d69a6ca93f2cc10..790e7e593fe2f5309ca8fd8a59fef78e9f7e2596 100644 (file)
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index 06c36b6ab6baf15548cff6490f47a75fbf61c84d..3c863422fea7617b5edc306f8c0700e585d317fd 100644 (file)
--- a/encoder/cavlc.c
+++ b/encoder/cavlc.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 32d06c2878d1678628f63a10e5ffcdf04d7161e2..ac6e722fccc132ca8d86b0aec96f87a410456686 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/encoder/eval.c b/encoder/eval.c
index eec1cc037486529c125fd619e3950e8cd184dda4..76b76bec52ecedf0c73ec5e38dd19f38f18f264e 100644 (file)
--- a/encoder/eval.c
+++ b/encoder/eval.c
@@ -27,7 +27,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index b6541fa40a95f60f538c239a7a6244d61b21e196..1a11fcba89cff8d083fe82e9384e0df3582dbbfb 100644 (file)
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/encoder/me.c b/encoder/me.c
index e90da1649bbbddbb7f65f340d0a26e664783ac59..16a0b72ab4593fdb86b7859383f17a367702044e 100644 (file)
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 9a07ed98505be00eecf5715cc59d0a26b85e286b..b9b4363db8cc47c1a93a468335f0ac62c2148eab 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -25,7 +25,6 @@
 
 #define _ISOC99_SOURCE
 #undef NDEBUG // always check asserts, the speed effect is far too small to disable them
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/encoder/set.c b/encoder/set.c
index a8c645ffa33c0dd52823dbeb00738f3c2a8e9cf1..dbf544389587da717e0c2257ca819b428deede45 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -21,18 +21,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <inttypes.h>
-#endif
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
 #include <math.h>
 
-#include "x264.h"
 #include "common/common.h"
 #ifndef _MSC_VER
 #include "config.h"

diff --git a/encoder/slicetype_decision.c b/encoder/slicetype_decision.c
index 476b8006b3b7b7bd14a6728548a4de5ad70fc01f..8800785ca152fca25ed771cd817cca502d2937c3 100644 (file)
--- a/encoder/slicetype_decision.c
+++ b/encoder/slicetype_decision.c
@@ -20,7 +20,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <limits.h>