Move HAVE_AV_CONFIG_H definition to the Makefile like in the rest of FFmpeg.

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

diff --git a/Makefile b/Makefile
index f72bbe4..4432e78 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ VPATH=$(SRC_PATH_BARE)
 
 CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
        -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
-       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H
 LDFLAGS+= -g
 
 PROGS-$(CONFIG_FFMPEG)   += ffmpeg

diff --git a/cmdutils.c b/cmdutils.c
index 1a114ae..171574c 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -18,7 +18,7 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#define HAVE_AV_CONFIG_H
+
 #include "avformat.h"
 #include "cmdutils.h"
 

diff --git a/ffmpeg.c b/ffmpeg.c
index c364b11..cc97ce6 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -18,7 +18,7 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#define HAVE_AV_CONFIG_H
+
 #include <signal.h>
 #include <limits.h>
 #include "avformat.h"

diff --git a/ffplay.c b/ffplay.c
index 23917ac..304eadc 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -18,7 +18,7 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#define HAVE_AV_CONFIG_H
+
 #include "avformat.h"
 #include "swscale.h"
 

diff --git a/ffserver.c b/ffserver.c
index 8f9bba6..14c77cc 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -18,7 +18,7 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#define HAVE_AV_CONFIG_H
+
 #include "avformat.h"
 
 #include <stdarg.h>

diff --git a/output_example.c b/output_example.c
index ca12b78..39866d8 100644 (file)
--- a/output_example.c
+++ b/output_example.c
@@ -34,6 +34,8 @@
 #include "avformat.h"
 #include "swscale.h"
 
+#undef exit
+
 /* 5 seconds stream duration */
 #define STREAM_DURATION   5.0
 #define STREAM_FRAME_RATE 25 /* 25 images/s */