winlin

fix bug for libfdk aac.

@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 ff_src_dir="../../3rdparty" 3 ff_src_dir="../../3rdparty"
4 4
5 # the jobs to make ffmpeg 5 # the jobs to make ffmpeg
6 -if [[ "" -eq SRS_JOBS ]]; then 6 +if [[ "" == $SRS_JOBS ]]; then
7 export SRS_JOBS="--jobs=1" 7 export SRS_JOBS="--jobs=1"
8 fi 8 fi
9 9
@@ -38,9 +38,6 @@ fi @@ -38,9 +38,6 @@ fi
38 # ffmpeg can specifies the yasm path when configure it. 38 # ffmpeg can specifies the yasm path when configure it.
39 export PATH=${PATH}:${ff_release_dir}/bin 39 export PATH=${PATH}:${ff_release_dir}/bin
40 40
41 -# the aac command for ffmepg.  
42 -AAC_FOR_FFMPEG="--enable-libfdk-aac"  
43 -  
44 # libfdk-aac 41 # libfdk-aac
45 if [[ -f ${ff_release_dir}/lib/libfdk-aac.a ]]; then 42 if [[ -f ${ff_release_dir}/lib/libfdk-aac.a ]]; then
46 echo "libfdk_aac is ok" 43 echo "libfdk_aac is ok"
@@ -52,24 +49,6 @@ else @@ -52,24 +49,6 @@ else
52 ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build fdk-aac-0.1.3 failed"; exit 1; fi 49 ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build fdk-aac-0.1.3 failed"; exit 1; fi
53 fi 50 fi
54 51
55 -# libaacplus  
56 -if [ $UBUNTU14 = NO ]; then  
57 - AAC_FOR_FFMPEG="$AAC_FOR_FFMPEG --enable-libaacplus"  
58 -  
59 - if [[ -f ${ff_release_dir}/lib/libaacplus.a ]]; then  
60 - echo "libaacplus is ok"  
61 - else  
62 - echo "build libaacplus-2.0.2"  
63 - cd $ff_current_dir &&  
64 - rm -rf libaacplus-2.0.2 && unzip -q ${ff_src_dir}/libaacplus-2.0.2.zip &&  
65 - cd libaacplus-2.0.2 && cp ../${ff_src_dir}/libaacplus-patch-26410-800.zip src/26410-800.zip &&  
66 - bash autogen.sh && ./configure --prefix=${ff_release_dir} --enable-static && make && make install  
67 - ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build libaacplus-2.0.2 failed"; exit 1; fi  
68 - fi  
69 -fi  
70 -  
71 -echo "aac for ffmepg: $AAC_FOR_FFMPEG"  
72 -  
73 # lame-3.99 52 # lame-3.99
74 if [[ -f ${ff_release_dir}/lib/libmp3lame.a ]]; then 53 if [[ -f ${ff_release_dir}/lib/libmp3lame.a ]]; then
75 echo "libmp3lame is ok" 54 echo "libmp3lame is ok"
@@ -128,7 +107,7 @@ else @@ -128,7 +107,7 @@ else
128 --extra-ldflags='-L${ffmpeg_exported_release_dir}/lib -lm -ldl' \ 107 --extra-ldflags='-L${ffmpeg_exported_release_dir}/lib -lm -ldl' \
129 --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \ 108 --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc \
130 --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \ 109 --enable-postproc --enable-bzlib --enable-zlib --enable-parsers \
131 - --enable-libx264 --enable-libmp3lame $AAC_FOR_FFMPEG --enable-libspeex \ 110 + --enable-libx264 --enable-libmp3lame --enable-libfdk-aac --enable-libspeex \
132 --enable-pthreads --extra-libs=-lpthread \ 111 --enable-pthreads --extra-libs=-lpthread \
133 --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers && 112 --enable-encoders --enable-decoders --enable-avfilter --enable-muxers --enable-demuxers &&
134 make ${SRS_JOBS} && make install 113 make ${SRS_JOBS} && make install