From 364a96070433d4c843620074d96dce562236ce6e Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 10 Jun 2007 14:34:56 +0000
Subject: [PATCH] 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
---
Makefile | 2 +-
cmdutils.c | 2 +-
ffmpeg.c | 2 +-
ffplay.c | 2 +-
ffserver.c | 2 +-
output_example.c | 2 ++
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index f72bbe42b00..4432e78524b 100644
--- 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 1a114aec9f5..171574c014c 100644
--- 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 c364b119274..cc97ce6a5ba 100644
--- 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 23917ac1c0d..304eadc83d3 100644
--- 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 8f9bba6b49c..14c77cc0367 100644
--- 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 ca12b783f1a..39866d892b7 100644
--- 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 */
--
GitLab