]> rtime.felk.cvut.cz Git - frescor/demo.git/commitdiff
FFMPEG is integrated to the demo build
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 14 May 2009 13:32:46 +0000 (15:32 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 14 May 2009 13:32:46 +0000 (15:32 +0200)
README
build/ffmpeg [new symlink]
src/ffmpeg

diff --git a/README b/README
index 37ec4595e19b194fa6617bf480e09ba0e0d37869..ac11cf9511e16ccc884de5df6efdcb1e64040e8b 100644 (file)
--- a/README
+++ b/README
@@ -13,4 +13,5 @@ To compile this demo follow the following steps:
 
    cd build
    make default-config
+   ( cd ffmpeg && ./configure4omk )
    make
diff --git a/build/ffmpeg b/build/ffmpeg
new file mode 120000 (symlink)
index 0000000..582fe8e
--- /dev/null
@@ -0,0 +1 @@
+../src/ffmpeg
\ No newline at end of file
index ae7912c66a821b151693c0cc117b9e70ba111316..e60b080f779314c2d144e3139c996866c99e138b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ae7912c66a821b151693c0cc117b9e70ba111316
+Subproject commit e60b080f779314c2d144e3139c996866c99e138b