consistent include usage

Originally committed as revision 598 to svn://svn.ffmpeg.org/ffmpeg/trunk

7 files changed, 21 insertions, 54 deletions

diff --git a/libavcodec/liba52/a52.h b/libavcodec/liba52/a52.h
index 9db52ccf83..ca3c9f1087 100644
--- a/libavcodec/liba52/a52.h
+++ b/libavcodec/liba52/a52.h
@@ -24,6 +24,8 @@
 #ifndef A52_H
 #define A52_H
 
+#include "../avcodec.h"
+
 #ifndef LIBA52_DOUBLE
 typedef float sample_t;
 #else
diff --git a/libavcodec/liba52/bit_allocate.c b/libavcodec/liba52/bit_allocate.c
index 0567b22852..c988024552 100644
--- a/libavcodec/liba52/bit_allocate.c
+++ b/libavcodec/liba52/bit_allocate.c
@@ -20,11 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include "config.h"
-
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 
diff --git a/libavcodec/liba52/bitstream.c b/libavcodec/liba52/bitstream.c
index 70621c7c11..48632104fc 100644
--- a/libavcodec/liba52/bitstream.c
+++ b/libavcodec/liba52/bitstream.c
@@ -21,10 +21,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 #include "bitstream.h"
diff --git a/libavcodec/liba52/downmix.c b/libavcodec/liba52/downmix.c
index b9ac1fdeaa..d8d9c8012b 100644
--- a/libavcodec/liba52/downmix.c
+++ b/libavcodec/liba52/downmix.c
@@ -21,11 +21,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
-#include <string.h>
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 
diff --git a/libavcodec/liba52/imdct.c b/libavcodec/liba52/imdct.c
index ba08318aa2..c61004b9b5 100644
--- a/libavcodec/liba52/imdct.c
+++ b/libavcodec/liba52/imdct.c
@@ -24,18 +24,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
-#include <math.h>
-#include <stdio.h>
-#ifdef LIBA52_DJBFFT
-#include <fftc4.h>
-#endif
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795029
-#endif
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 #include "mm_accel.h"
diff --git a/libavcodec/liba52/parse.c b/libavcodec/liba52/parse.c
index 74dce78d9d..59f21591b7 100644
--- a/libavcodec/liba52/parse.c
+++ b/libavcodec/liba52/parse.c
@@ -21,12 +21,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include "a52.h"
 #include "a52_internal.h"
 #include "bitstream.h"
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 59dd654dd1..3198441d09 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -1,27 +1,24 @@
 /*
-    Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include <inttypes.h>
-#include <stdio.h>
-
-#include "common.h" //needed for mpegvideo.h to compile
-#include "dsputil.h" //needed for mpegvideo.h to compile
+ * Rate control for video encoders
+ *
+ * Copyright (c) 2002 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 #include "avcodec.h"
+#include "dsputil.h"
 #include "mpegvideo.h"
 
 #define STATS_FILE "lavc_stats.txt"