Add avresample lib to cmakelists and enable build

lynckia · May 23, 2018 · 62ba1e0 · 62ba1e0
1 parent 6d21295
commit 62ba1e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/erizo/src/CMakeLists.txt b/erizo/src/CMakeLists.txt
@@ -96,6 +96,9 @@ set (LIBS ${LIBS} ${AVCODEC})
 find_library(AVFORMAT avformat HINTS "${THIRD_PARTY_LIB}")
 test_lib(${AVFORMAT})
 set (LIBS ${LIBS} ${AVFORMAT})
+find_library(AVRESAMPLE avresample HINTS "${THIRD_PARTY_LIB}")
+test_lib(${AVRESAMPLE})
+set (LIBS ${LIBS} ${AVRESAMPLE})
 
 # LOG4CXX
 find_library(LOG log4cxx)

diff --git a/scripts/installMacDeps.sh b/scripts/installMacDeps.sh
@@ -176,7 +176,7 @@ install_mediadeps(){
     curl -O -L https://ffmpeg.org/releases/ffmpeg-3.4.2.tar.gz
     tar -zxvf ffmpeg-3.4.2.tar.gz
     cd ffmpeg-3.4.2
-    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-gpl --enable-libvpx --enable-libx264 --enable-libopus --disable-doc && \
+    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-gpl --enable-libvpx --enable-libx264 --enable-libopus --disable-doc --enable-avresample && \
     make $FAST_MAKE -s V=0 && \
     make install
     check_result $?
@@ -194,7 +194,7 @@ install_mediadeps_nogpl(){
     curl -O -L https://ffmpeg.org/releases/ffmpeg-3.4.2.tar.gz
     tar -zxvf ffmpeg-3.4.2.tar.gz
     cd ffmpeg-3.4.2
-    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-libvpx --enable-libopus --disable-doc && \
+    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-libvpx --enable-libopus --disable-doc --enable-avresample && \
     make $FAST_MAKE -s V=0 && \
     make install
     check_result $?

diff --git a/scripts/installUbuntuDeps.sh b/scripts/installUbuntuDeps.sh
@@ -160,7 +160,7 @@ install_mediadeps(){
     curl -O -L https://ffmpeg.org/releases/ffmpeg-3.4.2.tar.gz
     tar -zxvf ffmpeg-3.4.2.tar.gz
     cd ffmpeg-3.4.2
-    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-gpl --enable-libvpx --enable-libx264 --enable-libopus --disable-doc
+    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-gpl --enable-libvpx --enable-libx264 --enable-libopus --disable-doc --enable-avresample
     make $FAST_MAKE -s V=0
     make install
     cd $CURRENT_DIR
@@ -179,7 +179,7 @@ install_mediadeps_nogpl(){
     curl -O -L https://ffmpeg.org/releases/ffmpeg-3.4.2.tar.gz
     tar -zxvf ffmpeg-3.4.2.tar.gz
     cd ffmpeg-3.4.2
-    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-gpl --enable-libvpx --enable-libopus --disable-doc
+    PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig ./configure --prefix=$PREFIX_DIR --enable-shared --enable-gpl --enable-libvpx --enable-libopus --disable-doc --enable-avresample
     make $FAST_MAKE -s V=0
     make install
     cd $CURRENT_DIR