[FFmpeg-cvslog] r9273 - in trunk: Makefile cmdutils.c ffmpeg.c ffplay.c ffserver.c output_example.c

[diego]

Author: diego
Date: Sun Jun 10 16:34:56 2007
New Revision: 9273

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


Modified:
   trunk/Makefile
   trunk/cmdutils.c
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/ffserver.c
   trunk/output_example.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Jun 10 16:34:56 2007
@@ -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

Modified: trunk/cmdutils.c
==============================================================================
--- trunk/cmdutils.c	(original)
+++ trunk/cmdutils.c	Sun Jun 10 16:34:56 2007
@@ -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"
 

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Sun Jun 10 16:34:56 2007
@@ -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"

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Sun Jun 10 16:34:56 2007
@@ -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"
 

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Sun Jun 10 16:34:56 2007
@@ -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>

Modified: trunk/output_example.c
==============================================================================
--- trunk/output_example.c	(original)
+++ trunk/output_example.c	Sun Jun 10 16:34:56 2007
@@ -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 */