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

Replace ffmpeg version from 2.1.1 to 3.2.4

Browse source
This commit is contained in:
HungMingWu 2017-02-13 23:29:39 +08:00
parent 2fcd3972c1
commit 33d6274217
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/auto/depends.sh
View file

@ -656,13 +656,13 @@ if [ $SRS_SSL = YES ]; then
fi
#####################################################################################
# live transcoding, ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2.
# live transcoding, ffmpeg-3.2.4, x264-core138, lame-3.99.5, libaacplus-2.0.2.
#####################################################################################
if [ $SRS_FFMPEG_TOOL = YES ]; then
if [[ -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]]; then
echo "The ffmpeg-2.1 is ok.";
echo "ffmpeg-3.2.4 is ok.";
else
echo "Building ffmpeg-2.1.";
echo "build ffmpeg-3.2.4";
(
cd ${SRS_OBJS} && pwd_dir=`pwd` &&
rm -rf ffmepg.src && mkdir -p ffmpeg.src && cd ffmpeg.src &&
@ -671,8 +671,8 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then
)
fi
# check status
ret=$?; if [[ $ret -ne 0 ]]; then echo "Build ffmpeg-2.1 failed, ret=$ret"; exit $ret; fi
if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "Build ffmpeg-2.1 failed."; exit -1; fi
ret=$?; if [[ $ret -ne 0 ]]; then echo "build ffmpeg-3.2.4 failed, ret=$ret"; exit $ret; fi
if [ ! -f ${SRS_OBJS}/ffmpeg/bin/ffmpeg ]; then echo "build ffmpeg-3.2.4 failed."; exit -1; fi
fi
#####################################################################################