Browse Source

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
Diego Biurrun 18 years ago
parent
commit
364a960704
6 changed files with 7 additions and 5 deletions
  1. 1 1
      Makefile
  2. 1 1
      cmdutils.c
  3. 1 1
      ffmpeg.c
  4. 1 1
      ffplay.c
  5. 1 1
      ffserver.c
  6. 2 0
      output_example.c

+ 1 - 1
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

+ 1 - 1
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"
 

+ 1 - 1
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"

+ 1 - 1
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"
 

+ 1 - 1
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>

+ 2 - 0
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 */