diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-02-01 14:12:50 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-02-01 14:12:50 +0300 |
| commit | de2d819d450459908a96343f28fe6c5f285ea780 (patch) | |
| tree | d2dc23de9e2bfcfabdfd58787cb0a50da4c109f8 /build_ffmpeg.sh | |
| parent | 393216629c85238f536747b0a434c1f669ea6e17 (diff) | |
Update ffmpeg
External dcadec has been replaced by the new dcadec-based decoder inside ffmpeg
Diffstat (limited to 'build_ffmpeg.sh')
| -rw-r--r-- | build_ffmpeg.sh | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/build_ffmpeg.sh b/build_ffmpeg.sh index 4bc75459..fd524c58 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 |