diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh old mode 100644 new mode 100755 index 2d9099cfc..c145462a2 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -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 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, # srs always compile the FFMPEG tool stub which used to start the FFMPEG process. 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 - echo "#undef SRS_AUTO_FFMPEG" >> $SRS_AUTO_HEADERS_H + echo "#undef SRS_AUTO_FFMPEG_STUB" >> $SRS_AUTO_HEADERS_H fi if [ $SRS_TRANSCODE = YES ]; then diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp index 772393cc3..7ecbd0228 100644 --- a/trunk/src/app/srs_app_ffmpeg.cpp +++ b/trunk/src/app/srs_app_ffmpeg.cpp @@ -36,7 +36,7 @@ using namespace std; #include #include -#ifdef SRS_AUTO_FFMPEG +#ifdef SRS_AUTO_FFMPEG_STUB #define SRS_RTMP_ENCODER_COPY "copy" #define SRS_RTMP_ENCODER_NO_VIDEO "vn" diff --git a/trunk/src/app/srs_app_ffmpeg.hpp b/trunk/src/app/srs_app_ffmpeg.hpp index 54af4a9cd..60a92d20d 100644 --- a/trunk/src/app/srs_app_ffmpeg.hpp +++ b/trunk/src/app/srs_app_ffmpeg.hpp @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#ifdef SRS_AUTO_FFMPEG +#ifdef SRS_AUTO_FFMPEG_STUB #include #include diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index ac34b5646..43ed8a676 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "223" +#define VERSION_REVISION "224" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index ab0a0deb9..bd4f72f03 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -125,7 +125,7 @@ void show_macro_features() srs_warn("compile nginx: off"); #endif -#ifdef SRS_AUTO_FFMPEG +#ifdef SRS_AUTO_FFMPEG_TOOL srs_trace("compile ffmpeg: on"); #else srs_warn("compile ffmpeg: off");