Skip to content

Commit

Permalink
Update ffmpeg
Browse files Browse the repository at this point in the history
External dcadec has been replaced by the new dcadec-based decoder inside ffmpeg
  • Loading branch information
Nevcairiel committed Feb 1, 2016
1 parent 3932166 commit de2d819
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 27 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Expand Up @@ -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
22 changes: 0 additions & 22 deletions build_ffmpeg.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg
Submodule ffmpeg updated from a65a18 to 2d4797
1 change: 0 additions & 1 deletion thirdparty/dcadec
Submodule dcadec deleted from 3a8b58

0 comments on commit de2d819

Please sign in to comment.