for merge

@@ -80,7 +80,7 @@ else
         --yasmexe=${ff_yasm_bin} \
         --yasmexe=${ff_yasm_bin} \
         --prefix=${ff_release_dir} --cc= \
         --prefix=${ff_release_dir} --cc= \
         --enable-static --disable-shared --disable-debug \
         --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' \
         --extra-ldflags='-L${ffmpeg_exported_release_dir}/lib -lm -ldl' \
         --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \
         --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \
         --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \
         --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \

@@ -169,7 +169,7 @@ public:
 	* @return the matched source, never be NULL.
 	* @return the matched source, never be NULL.
 	* @remark stream_url should without port and schema.
 	* @remark stream_url should without port and schema.
 	*/
 	*/
-	static SrsSource* find(std::string stream_url);
+	static SrsSource* find(const std::string& stream_url);
 private:
 private:
 	std::string stream_url;
 	std::string stream_url;
 	// to delivery stream to clients.
 	// to delivery stream to clients.
@@ -221,4 +221,4 @@ public:
 	virtual void set_cache(bool enabled);
 	virtual void set_cache(bool enabled);
 };
 };
 
 
-#endif
+#endif