]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
Updated to compile correctly with FRSH
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 26 Nov 2009 18:23:22 +0000 (19:23 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 26 Nov 2009 18:23:22 +0000 (19:23 +0100)
Modified submodules:

* src/fwp debb9e1...8368f4f (1):
  > Do not use connect() for UDP sockets

build/Makefile.omk.ffmpeg
build/config.target
src/fwp

index b5afe2ca57b2f4371ddf3f3714898b83a9fc6e11..a6a3a38d33c5268fe03e36ab9c97931a62898f4b 100644 (file)
@@ -8,7 +8,9 @@ SUBDIRS = tools libavcodec libavdevice libavfilter libavformat  \
          libavutil libpostproc libswscale
 renamed_include_HEADERS=
 
+ifneq ($(CONFIG_FFMPEG_WITH_FRSH),y)
 bin_PROGRAMS = ffmpeg #pktdumper
+endif
 pktdumper_SOURCES = tools/pktdumper.c
 pktdumper_LIBS = avformat
 
index d0a80c7c9f6b4817ccad725bf1b42a9fc7706431..7f97b0e822cb4e9d3ce02191336dd44667e822cc 100644 (file)
@@ -1,6 +1,8 @@
 # -*- makefile -*-
 # Config file for compilation by OMK for AQuoSA/Linux OS target
 
+OMIT_KERNEL_PASSES=y
+
 # For the FFMPEG2OMK hack, we need RELATIVE_DIR earlier:
 ifndef RELATIVE_DIR
 RELATIVE_DIR := $(SOURCES_DIR:$(OUTPUT_DIR)%=%)
diff --git a/src/fwp b/src/fwp
index debb9e19b181a65f07226e719990567651f87fec..8368f4f3c03bfb998692c3f4c272858c050d7fdd 160000 (submodule)
--- a/src/fwp
+++ b/src/fwp
@@ -1 +1 @@
-Subproject commit debb9e19b181a65f07226e719990567651f87fec
+Subproject commit 8368f4f3c03bfb998692c3f4c272858c050d7fdd