From a7c83b1aeebe51cc7a06465010d27f7803e203ab Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 1 Dec 2013 10:55:06 +0800
Subject: [PATCH] support ffmpeg filter

---
 trunk/conf/srs.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index 3212bc449..f358323d2 100755
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -23,10 +23,10 @@ vhost __defaultVhost__ {
         engine fast{
             enabled         on;
             vfilter {
-                vf                  'drawtext=text=SRS';
+                #vf                  'drawtext=text=SRS';
                 #vf                  'crop=in_w-20:in_h-160:10:80';
-                #i                   ./doc/ffmpeg-logo.png;
-                #filter_complex      'overlay=10:10';
+                i                   ./doc/ffmpeg-logo.png;
+                filter_complex      'overlay=10:10';
             }
             vcodec          libx264;
             vbitrate        300;
@@ -48,7 +48,7 @@ vhost __defaultVhost__ {
             output          rtmp://[vhost]:[port]/[app]/[stream]_fast;
         }
         engine sd{
-            enabled         off;
+            enabled         on;
             vfilter {
                 vf                  'split [main][tmp]; [tmp] crop=iw:ih/2:0:0, vflip [flip]; [main][flip] overlay=0:H/2';
             }