external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224

Browse source
This commit is contained in:
winlin 2014-10-09 10:41:24 +08:00
parent 9789335d0b
commit 2ed794ad52
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
trunk/auto/depends.sh Normal file → Executable file
View file

@ -658,12 +658,19 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then
if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-2.1 failed."; exit -1; fi if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-2.1 failed."; exit -1; fi
fi fi
# whether compile ffmpeg tool
if [ $SRS_FFMPEG_TOOL = YES ]; then
echo "#define SRS_AUTO_FFMPEG_TOOL" >> $SRS_AUTO_HEADERS_H
else
echo "#undef SRS_AUTO_FFMPEG_TOOL" >> $SRS_AUTO_HEADERS_H
fi
# whatever the FFMPEG tools, if transcode and ingest specified, # whatever the FFMPEG tools, if transcode and ingest specified,
# srs always compile the FFMPEG tool stub which used to start the FFMPEG process. # srs always compile the FFMPEG tool stub which used to start the FFMPEG process.
if [ $SRS_FFMPEG_STUB = YES ]; then if [ $SRS_FFMPEG_STUB = YES ]; then
echo "#define SRS_AUTO_FFMPEG" >> $SRS_AUTO_HEADERS_H echo "#define SRS_AUTO_FFMPEG_STUB" >> $SRS_AUTO_HEADERS_H
else else
echo "#undef SRS_AUTO_FFMPEG" >> $SRS_AUTO_HEADERS_H echo "#undef SRS_AUTO_FFMPEG_STUB" >> $SRS_AUTO_HEADERS_H
fi fi
if [ $SRS_TRANSCODE = YES ]; then if [ $SRS_TRANSCODE = YES ]; then

2
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -36,7 +36,7 @@ using namespace std;
#include <srs_kernel_log.hpp> #include <srs_kernel_log.hpp>
#include <srs_app_config.hpp> #include <srs_app_config.hpp>
#ifdef SRS_AUTO_FFMPEG #ifdef SRS_AUTO_FFMPEG_STUB
#define SRS_RTMP_ENCODER_COPY "copy" #define SRS_RTMP_ENCODER_COPY "copy"
#define SRS_RTMP_ENCODER_NO_VIDEO "vn" #define SRS_RTMP_ENCODER_NO_VIDEO "vn"

2
trunk/src/app/srs_app_ffmpeg.hpp
View file

@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <srs_core.hpp> #include <srs_core.hpp>
#ifdef SRS_AUTO_FFMPEG #ifdef SRS_AUTO_FFMPEG_STUB
#include <string> #include <string>
#include <vector> #include <vector>

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "223" #define VERSION_REVISION "224"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"

2
trunk/src/main/srs_main_server.cpp
View file

@ -125,7 +125,7 @@ void show_macro_features()
srs_warn("compile nginx: off"); srs_warn("compile nginx: off");
#endif #endif
#ifdef SRS_AUTO_FFMPEG #ifdef SRS_AUTO_FFMPEG_TOOL
srs_trace("compile ffmpeg: on"); srs_trace("compile ffmpeg: on");
#else #else
srs_warn("compile ffmpeg: off"); srs_warn("compile ffmpeg: off");