[SCM] libav/experimental: added HAVE_AV_CONFIG_H

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:29:42 UTC 2013


The following commit has been merged in the experimental branch:
commit 420b073bbcce462d47c8020ce30112627c08ac13
Author: Fabrice Bellard <fabrice at bellard.org>
Date:   Mon Jul 30 23:22:07 2001 +0000

    added HAVE_AV_CONFIG_H
    
    
    Originally committed as revision 19 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libav/Makefile b/libav/Makefile
index 0f5dcf3..ac25e49 100644
--- a/libav/Makefile
+++ b/libav/Makefile
@@ -1,5 +1,5 @@
 include ../config.mak
-CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec
+CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H
 
 OBJS= rm.o mpeg.o asf.o avienc.o jpegenc.o swf.o wav.o raw.o \
 	 avidec.o ffm.o \
diff --git a/libavcodec/common.h b/libavcodec/common.h
index 3b46035..e6cb5fb 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -1,7 +1,9 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#ifdef HAVE_AV_CONFIG_H
 #include "../config.h"
+#endif
 
 #ifndef __WINE_WINDEF16_H
 /* workaround for typedef conflict in MPlayer (wine typedefs) */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list