From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 14 May 2009 13:32:46 +0000 (+0200)
Subject: FFMPEG is integrated to the demo build
X-Git-Tag: frescor-review~29
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/demo.git/commitdiff_plain/0218ceea2778cbf48860b1f2de9b6747210ccdbd

FFMPEG is integrated to the demo build
---

diff --git a/README b/README
index 37ec459..ac11cf9 100644
--- 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
index 0000000..582fe8e
--- /dev/null
+++ b/build/ffmpeg
@@ -0,0 +1 @@
+../src/ffmpeg
\ No newline at end of file
diff --git a/src/ffmpeg b/src/ffmpeg
index ae7912c..e60b080 160000
--- a/src/ffmpeg
+++ b/src/ffmpeg
@@ -1 +1 @@
-Subproject commit ae7912c66a821b151693c0cc117b9e70ba111316
+Subproject commit e60b080f779314c2d144e3139c996866c99e138b