Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit

fixed build liunx sh

.travis.yml

@@ -5,29 +5,8 @@ compiler:
 - clang
 os:
 - linux
-before_install:
-- sudo apt-get install libssl-dev
-- sudo apt-get install libmysqlclient-dev
-- sudo apt-get install libx264-dev
-- sudo apt-get install libfaac-dev
-- sudo apt-get install libmp4v2-dev
-env:
-  global:
-  - GIT_REPO=https://github.com/xiongziliang/ZLToolKit.git
 script:
-- git clone --depth=50 $GIT_REPO
+- ./build_for_linux.sh
-- cd ZLToolKit
-- mkdir -p build
-- cd build
-- cmake ..
-- make
-- sudo make install
-- cd ../../
-- mkdir -p build
-- cd build
-- cmake ..
-- make
-- sudo make install