diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-06-10 14:34:56 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-06-10 14:34:56 +0000 |
| commit | 364a96070433d4c843620074d96dce562236ce6e (patch) | |
| tree | a18643cc0b501b29fbfe01b5c93e62a66dd61c4a | |
| parent | bb8fe69a093fe4a0b6b49486dd5bfa03ed3cba8d (diff) | |
| download | ffmpeg-364a96070433d4c843620074d96dce562236ce6e.tar.gz | |
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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cmdutils.c | 2 | ||||
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | ffplay.c | 2 | ||||
| -rw-r--r-- | ffserver.c | 2 | ||||
| -rw-r--r-- | output_example.c | 2 |
6 files changed, 7 insertions, 5 deletions
@@ -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 1a114aec9f..171574c014 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" @@ -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" @@ -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 8f9bba6b49..14c77cc036 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 ca12b783f1..39866d892b 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 */ |