]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
Use FFMPEG with on-line omkization
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 25 Nov 2009 12:19:32 +0000 (13:19 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 25 Nov 2009 12:19:57 +0000 (13:19 +0100)
Modified submodules:

* src/ffmpeg c85f1eb...74b7334 (7):
  > Removed static omkization

build/config.target
src/ffmpeg

index 423840278c7dbe67fcd51afeb750d9328c4a35f1..264b279959f146584490c1b2a4e2479b19568c95 100644 (file)
@@ -20,6 +20,8 @@ ifeq ($(SOURCES_DIR:%/libavcodec=YES),YES)
        $(Q)echo 'SUBDIRS=x86' >> $@
 endif
        $(Q)cat $(MAKERULES_DIR)/Makefile.omk.ffmpeg >> $@
+       $(Q)echo 'CFLAGS := $(CFLAGS) $$(CFLAGS)' >> $@
+
 
 $(MAKERULES_DIR)/ffmpeg/libavcodec/x86/Makefile:
        touch $@
index c85f1eb5640e2eb2087b1c18eb65e803d5bedaf6..74b7334ba3042282d93e60c1c152c461a703c494 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c85f1eb5640e2eb2087b1c18eb65e803d5bedaf6
+Subproject commit 74b7334ba3042282d93e60c1c152c461a703c494