external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for merge

Browse source
This commit is contained in:
wenjiegit 2013-12-13 02:07:50 +08:00
parent 6e9f375606
commit 25caf5db36
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/build_ffmpeg.sh
View file

@ -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 \

4
trunk/src/core/srs_core_source.hpp
View file

@ -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
#endif