正在显示
12 个修改的文件
包含
12 行增加
和
9 行删除
trunk/3rdparty/ffmpeg-2.1.1.tar.gz
已删除
100644 → 0
不能预览此文件类型
trunk/3rdparty/ffmpeg-2.1.1.zip
0 → 100644
不能预览此文件类型
trunk/3rdparty/lame-3.99.5.tar.gz
已删除
100644 → 0
不能预览此文件类型
trunk/3rdparty/lame-3.99.5.zip
0 → 100644
不能预览此文件类型
trunk/3rdparty/libaacplus-2.0.2.tar.gz
已删除
100644 → 0
不能预览此文件类型
trunk/3rdparty/libaacplus-2.0.2.zip
0 → 100644
不能预览此文件类型
不能预览此文件类型
trunk/3rdparty/readme.txt
100644 → 100755
| @@ -8,11 +8,13 @@ st-1.9.zip | @@ -8,11 +8,13 @@ st-1.9.zip | ||
| 8 | basic framework for srs. | 8 | basic framework for srs. |
| 9 | 9 | ||
| 10 | ffmpeg-2.1.1.tar.gz | 10 | ffmpeg-2.1.1.tar.gz |
| 11 | +yasm-1.2.0.tar.gz | ||
| 11 | lame-3.99.5.tar.gz | 12 | lame-3.99.5.tar.gz |
| 12 | libaacplus-2.0.2.tar.gz | 13 | libaacplus-2.0.2.tar.gz |
| 13 | -libaacplus-patch-26410-b00.zip | 14 | +libaacplus-patch-26410-800.zip (26410-800.zip) |
| 14 | x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) | 15 | x264-snapshot-20131129-2245-stable.tar.bz2 (core.138) |
| 15 | for srs to support live stream transcoding. | 16 | for srs to support live stream transcoding. |
| 17 | + remark: we use *.zip for all linux plantform. | ||
| 16 | 18 | ||
| 17 | tools/ccache-3.1.9.zip | 19 | tools/ccache-3.1.9.zip |
| 18 | to fast build. | 20 | to fast build. |
| @@ -32,5 +34,8 @@ links: | @@ -32,5 +34,8 @@ links: | ||
| 32 | http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz | 34 | http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz |
| 33 | aacplus-patch: | 35 | aacplus-patch: |
| 34 | http://www.3gpp.org/DynaReport/26410.htm | 36 | http://www.3gpp.org/DynaReport/26410.htm |
| 35 | - http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-b00.zip | 37 | + http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip |
| 38 | + yasm: | ||
| 39 | + http://yasm.tortall.net/ | ||
| 40 | + http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz | ||
| 36 | 41 |
不能预览此文件类型
不能预览此文件类型
trunk/3rdparty/yasm-1.2.0.zip
0 → 100644
不能预览此文件类型
| @@ -52,11 +52,10 @@ if [ $SRS_HLS = YES ]; then | @@ -52,11 +52,10 @@ if [ $SRS_HLS = YES ]; then | ||
| 52 | else | 52 | else |
| 53 | echo "build nginx-1.5.7"; | 53 | echo "build nginx-1.5.7"; |
| 54 | ( | 54 | ( |
| 55 | - pwd_dir=`pwd` && | ||
| 56 | rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} && | 55 | rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} && |
| 57 | unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 && | 56 | unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 && |
| 58 | ./configure --prefix=`pwd`/_release && make && make install && | 57 | ./configure --prefix=`pwd`/_release && make && make install && |
| 59 | - ln -sf ${pwd_dir}/nginx-1.5.7/_release nginx | 58 | + cd .. && ln -sf nginx-1.5.7/_release nginx |
| 60 | ) | 59 | ) |
| 61 | fi | 60 | fi |
| 62 | # check status | 61 | # check status |
| @@ -94,11 +93,10 @@ if [ $SRS_FFMPEG = YES ]; then | @@ -94,11 +93,10 @@ if [ $SRS_FFMPEG = YES ]; then | ||
| 94 | else | 93 | else |
| 95 | echo "build ffmpeg-2.1"; | 94 | echo "build ffmpeg-2.1"; |
| 96 | ( | 95 | ( |
| 97 | - pwd_dir=`pwd` && exit 0; | ||
| 98 | - rm -rf ${SRS_OBJS}/nginx-1.5.7 && cd ${SRS_OBJS} && | ||
| 99 | - unzip -q ../3rdparty/nginx-1.5.7.zip && cd nginx-1.5.7 && | ||
| 100 | - ./configure --prefix=`pwd`/_release && make && make install && | ||
| 101 | - ln -sf ${pwd_dir}/nginx-1.5.7/_release nginx | 96 | + cd ${SRS_OBJS} && pwd_dir=`pwd` && |
| 97 | + rm -rf ffmepg.src && mkdir -p ffmpeg.src && cd ffmpeg.src && | ||
| 98 | + rm -f build_ffmpeg.sh && ln -sf ../../auto/build_ffmpeg.sh && . build_ffmpeg.sh && | ||
| 99 | + cd ${pwd_dir} && ln -sf ffmepg.src/_release ffmpeg | ||
| 102 | ) | 100 | ) |
| 103 | fi | 101 | fi |
| 104 | # check status | 102 | # check status |
-
请 注册 或 登录 后发表评论