diff --git a/.gitmodules b/.gitmodules index 3698e4324..3296ec1a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "qsdecoder"] path = qsdecoder url = git://git.1f0.de/qsdecoder.git -[submodule "thirdparty/dcadec"] - path = thirdparty/dcadec - url = https://github.com/foo86/dcadec.git diff --git a/build_ffmpeg.sh b/build_ffmpeg.sh index 4bc754592..fd524c588 100644 --- a/build_ffmpeg.sh +++ b/build_ffmpeg.sh @@ -24,10 +24,6 @@ do esac done -BASEDIR=$(pwd) -THIRDPARTYPREFIX=${BASEDIR}/bin_${archdir}/thirdparty -export PKG_CONFIG_PATH="${THIRDPARTYPREFIX}/lib/pkgconfig/" - make_dirs() ( mkdir -p bin_${archdir}/lib mkdir -p bin_${archdir}d/lib @@ -67,8 +63,6 @@ configure() ( --enable-hwaccel=wmv3_dxva2 \ --enable-hwaccel=mpeg2_dxva2 \ --enable-hwaccel=vp9_dxva2 \ - --disable-decoder=dca \ - --enable-libdcadec \ --enable-libspeex \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ @@ -104,24 +98,8 @@ build() ( make -j$NUMBER_OF_PROCESSORS ) -build_dcadec() ( - mkdir -p "${THIRDPARTYPREFIX}/dcadec" - cd "${THIRDPARTYPREFIX}/dcadec" - if $clean_build ; then - make -f "${BASEDIR}/thirdparty/dcadec/Makefile" CONFIG_WINDOWS=1 clean - fi - make -f "${BASEDIR}/thirdparty/dcadec/Makefile" -j$NUMBER_OF_PROCESSORS CONFIG_WINDOWS=1 CONFIG_SMALL=1 CC=${cross_prefix}gcc AR=${cross_prefix}ar PREFIX="${THIRDPARTYPREFIX}" install-lib - - cd "${BASEDIR}" -) - make_dirs -echo Building dcadec -echo - -build_dcadec - echo echo Building ffmpeg in GCC ${arch} Release config... echo diff --git a/ffmpeg b/ffmpeg index a65a181cc..2d4797d12 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit a65a181cc721076089607e6d4687afc64df474b7 +Subproject commit 2d4797d1283f5b3ad1b92b825c899a58a61d9a57 diff --git a/thirdparty/dcadec b/thirdparty/dcadec deleted file mode 160000 index 3a8b58ed5..000000000 --- a/thirdparty/dcadec +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3a8b58ed575418ebb528bd10851c15edb3785622