diff --git a/trunk/3rdparty/ffmpeg-2.1.1.tar.gz b/trunk/3rdparty/ffmpeg-2.1.1.tar.gz deleted file mode 100644 index 406706d63..000000000 Binary files a/trunk/3rdparty/ffmpeg-2.1.1.tar.gz and /dev/null differ diff --git a/trunk/3rdparty/ffmpeg-2.1.1.zip b/trunk/3rdparty/ffmpeg-2.1.1.zip new file mode 100644 index 000000000..f307918d9 Binary files /dev/null and b/trunk/3rdparty/ffmpeg-2.1.1.zip differ diff --git a/trunk/3rdparty/lame-3.99.5.tar.gz b/trunk/3rdparty/lame-3.99.5.tar.gz deleted file mode 100644 index 8d28199ac..000000000 Binary files a/trunk/3rdparty/lame-3.99.5.tar.gz and /dev/null differ diff --git a/trunk/3rdparty/lame-3.99.5.zip b/trunk/3rdparty/lame-3.99.5.zip new file mode 100644 index 000000000..a2d625b6b Binary files /dev/null and b/trunk/3rdparty/lame-3.99.5.zip differ diff --git a/trunk/3rdparty/libaacplus-2.0.2.tar.gz b/trunk/3rdparty/libaacplus-2.0.2.tar.gz deleted file mode 100644 index b864ee8e5..000000000 Binary files a/trunk/3rdparty/libaacplus-2.0.2.tar.gz and /dev/null differ diff --git a/trunk/3rdparty/libaacplus-2.0.2.zip b/trunk/3rdparty/libaacplus-2.0.2.zip new file mode 100644 index 000000000..ecf78dbf8 Binary files /dev/null and b/trunk/3rdparty/libaacplus-2.0.2.zip differ diff --git a/trunk/3rdparty/libaacplus-patch-26410-b00.zip b/trunk/3rdparty/libaacplus-patch-26410-800.zip similarity index 84% rename from trunk/3rdparty/libaacplus-patch-26410-b00.zip rename to trunk/3rdparty/libaacplus-patch-26410-800.zip index 2d4c5a17d..bef52eb6e 100644 Binary files a/trunk/3rdparty/libaacplus-patch-26410-b00.zip and b/trunk/3rdparty/libaacplus-patch-26410-800.zip differ diff --git a/trunk/3rdparty/readme.txt b/trunk/3rdparty/readme.txt old mode 100644 new mode 100755 index 63c2da1b1..8e4b302d2 --- a/trunk/3rdparty/readme.txt +++ b/trunk/3rdparty/readme.txt @@ -8,11 +8,13 @@ st-1.9.zip basic framework for srs. ffmpeg-2.1.1.tar.gz +yasm-1.2.0.tar.gz lame-3.99.5.tar.gz libaacplus-2.0.2.tar.gz -libaacplus-patch-26410-b00.zip +libaacplus-patch-26410-800.zip (26410-800.zip) x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) for srs to support live stream transcoding. + remark: we use *.zip for all linux plantform. tools/ccache-3.1.9.zip to fast build. @@ -32,5 +34,8 @@ links: http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz aacplus-patch: http://www.3gpp.org/DynaReport/26410.htm - http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-b00.zip + http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip + yasm: + http://yasm.tortall.net/ + http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz diff --git a/trunk/3rdparty/x264-snapshot-20131129-2245-stable.tar.bz2 b/trunk/3rdparty/x264-snapshot-20131129-2245-stable.tar.bz2 deleted file mode 100644 index 1d8ed9561..000000000 Binary files a/trunk/3rdparty/x264-snapshot-20131129-2245-stable.tar.bz2 and /dev/null differ diff --git a/trunk/3rdparty/x264-snapshot-20131129-2245-stable.zip b/trunk/3rdparty/x264-snapshot-20131129-2245-stable.zip new file mode 100644 index 000000000..82224512c Binary files /dev/null and b/trunk/3rdparty/x264-snapshot-20131129-2245-stable.zip differ diff --git a/trunk/3rdparty/yasm-1.2.0.zip b/trunk/3rdparty/yasm-1.2.0.zip new file mode 100644 index 000000000..93b5e384f Binary files /dev/null and b/trunk/3rdparty/yasm-1.2.0.zip differ diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index d6e3b7607..3f68ed2c7 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -52,11 +52,10 @@ if [ $SRS_HLS = YES ]; then else echo "build nginx-1.5.7"; ( - pwd_dir=`pwd` && rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} && unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 && ./configure --prefix=`pwd`/_release && make && make install && - ln -sf ${pwd_dir}/nginx-1.5.7/_release nginx + cd .. && ln -sf nginx-1.5.7/_release nginx ) fi # check status @@ -94,11 +93,10 @@ if [ $SRS_FFMPEG = YES ]; then else echo "build ffmpeg-2.1"; ( - pwd_dir=`pwd` && exit 0; - rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} && - unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 && - ./configure --prefix=`pwd`/_release && make && make install && - ln -sf ${pwd_dir}/nginx-1.5.7/_release nginx + cd ${SRS_OBJS} && pwd_dir=`pwd` && + rm -rf ffmepg.src && mkdir -p ffmpeg.src && cd ffmpeg.src && + rm -f build_ffmpeg.sh && ln -sf ../../auto/build_ffmpeg.sh && . build_ffmpeg.sh && + cd ${pwd_dir} && ln -sf ffmepg.src/_release ffmpeg ) fi # check status