Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo

[frescor/demo.git] / build / Makefile.omk.ffmpeg

diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg
index 1e07ef939ec26c0b6bfdf9bd5bdf709fb1a33c35..dd600af0d70d15dd1f0f49b82f0f217d7a40012e 100644 (file)
--- a/build/Makefile.omk.ffmpeg
+++ b/build/Makefile.omk.ffmpeg
@@ -1,4 +1,7 @@
 # -*- makefile-gmake -*-
+CFLAGS_SAVED:=$(CFLAGS)
+include $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile.inc.ffmpeg
+CFLAGS:=$(CFLAGS) $(CFLAGS_SAVED)
 
 lib_LIBRARIES:=$(NAME)
 $(NAME)_SOURCES:=$(OBJS:%.o=%.c) $(OBJS-y:%.o=%.c) $(OBJS-yes:%.o=%.c)
@@ -10,6 +13,8 @@ SUBDIRS = tools libavcodec libavdevice libavfilter libavformat        \
          libavutil libpostproc libswscale
 renamed_include_HEADERS=
 
+renamed_include_GEN_HEADERS=config.h->ffmpeg-config.h
+
 bin_PROGRAMS = ffmpeg #pktdumper
 pktdumper_SOURCES = tools/pktdumper.c
 pktdumper_LIBS = avformat
@@ -33,7 +38,7 @@ renamed_include_HEADERS += x86/timer.h->libavutil/x86/timer.h
 endif
 
 ifeq ($(FFMPEG_SUBDIR),libavformat)
-HEADERS += os_support.h
+HEADERS += os_support.h network.h
 default_CONFIG += CONFIG_FFMPEG_WITH_FRSH=x
 LOCAL_CONFIG_H = libavformat_config.h
 endif