- removed #include ../config.h, because it's included from common.h

  which is included from avcodec.h which is included from those files...

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

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index be2470b..469677b 100644 (file)
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -21,11 +21,6 @@
 #include <string.h>
 #include "avcodec.h"
 
-/* Stuff below is useful only for mplayer project */
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
 #ifdef USE_FASTMEMCPY
 #include "fastmemcpy.h"
 #endif

diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index 52331a6..8c69de2 100644 (file)
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -23,11 +23,6 @@
 #include "dsputil.h"
 #include "avcodec.h"
 
-/* Stuff below is useful only for mplayer project */
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
 #ifdef USE_FASTMEMCPY
 #include "fastmemcpy.h"
 #endif

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index d497d14..4e2f530 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -25,11 +25,6 @@
 
 #include "mpeg12data.h"
 
-/* Stuff below is useful only for mplayer project */
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
 #ifdef USE_FASTMEMCPY
 #include "fastmemcpy.h"
 #endif

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 49a9981..75a0c83 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -24,11 +24,6 @@
 #include "dsputil.h"
 #include "mpegvideo.h"
 
-/* Stuff below is useful only for mplayer project */
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
 #ifdef USE_FASTMEMCPY
 #include "fastmemcpy.h"
 #endif