From 25caf5db361b14fb40618fc04e6f76a47654e9a9 Mon Sep 17 00:00:00 2001
From: wenjiegit <wenjie@localhost.(none)>
Date: Fri, 13 Dec 2013 02:07:50 +0800
Subject: [PATCH] for merge

---
 trunk/auto/build_ffmpeg.sh         | 2 +-
 trunk/src/core/srs_core_source.hpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/trunk/auto/build_ffmpeg.sh b/trunk/auto/build_ffmpeg.sh
index d890ba471..04de4b01a 100755
--- a/trunk/auto/build_ffmpeg.sh
+++ b/trunk/auto/build_ffmpeg.sh
@@ -80,7 +80,7 @@ else
         --yasmexe=${ff_yasm_bin} \
         --prefix=${ff_release_dir} --cc= \
         --enable-static --disable-shared --disable-debug \
-        --extra-cflags='-I${ffmpeg_exported_release_dir}/include -I /usr/include/freetype2/' \
+        --extra-cflags='-I${ffmpeg_exported_release_dir}/include' \
         --extra-ldflags='-L${ffmpeg_exported_release_dir}/lib -lm -ldl' \
         --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \
         --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \
diff --git a/trunk/src/core/srs_core_source.hpp b/trunk/src/core/srs_core_source.hpp
index f951e63ad..99ef506ab 100644
--- a/trunk/src/core/srs_core_source.hpp
+++ b/trunk/src/core/srs_core_source.hpp
@@ -169,7 +169,7 @@ public:
 	* @return the matched source, never be NULL.
 	* @remark stream_url should without port and schema.
 	*/
-	static SrsSource* find(std::string stream_url);
+	static SrsSource* find(const std::string& stream_url);
 private:
 	std::string stream_url;
 	// to delivery stream to clients.
@@ -221,4 +221,4 @@ public:
 	virtual void set_cache(bool enabled);
 };
 
-#endif
\ No newline at end of file
+#endif