Merge pull request #2931 from antonlacon/ffmpeg-cleanup

ffmpeg: cleanup
This commit is contained in:
MilhouseVH 2018-09-08 23:52:06 +01:00 committed by GitHub
commit 8d979066ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,7 +13,6 @@ PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz"
PKG_SOURCE_DIR="FFmpeg-${PKG_VERSION}*" PKG_SOURCE_DIR="FFmpeg-${PKG_VERSION}*"
PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 openssl speex" PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 openssl speex"
PKG_SECTION="multimedia" PKG_SECTION="multimedia"
PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video." PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
PKG_BUILD_FLAGS="-gold" PKG_BUILD_FLAGS="-gold"
@ -58,15 +57,6 @@ if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
fi fi
case "$TARGET_ARCH" in
arm)
PKG_FFMPEG_TABLES="--enable-hardcoded-tables"
;;
*)
PKG_FFMPEG_TABLES="--disable-hardcoded-tables"
;;
esac
if target_has_feature neon; then if target_has_feature neon; then
PKG_FFMPEG_FPU="--enable-neon" PKG_FFMPEG_FPU="--enable-neon"
else else
@ -124,9 +114,7 @@ configure_target() {
--pkg-config="$TOOLCHAIN/bin/pkg-config" \ --pkg-config="$TOOLCHAIN/bin/pkg-config" \
--enable-optimizations \ --enable-optimizations \
--disable-extra-warnings \ --disable-extra-warnings \
--disable-ffprobe \ --disable-programs \
--disable-ffplay \
--enable-ffmpeg \
--enable-avdevice \ --enable-avdevice \
--enable-avcodec \ --enable-avcodec \
--enable-avformat \ --enable-avformat \
@ -135,7 +123,6 @@ configure_target() {
--enable-avfilter \ --enable-avfilter \
--disable-devices \ --disable-devices \
--enable-pthreads \ --enable-pthreads \
--disable-w32threads \
--enable-network \ --enable-network \
--disable-gnutls --enable-openssl \ --disable-gnutls --enable-openssl \
--disable-gray \ --disable-gray \
@ -151,9 +138,8 @@ configure_target() {
$PKG_FFMPEG_VDPAU \ $PKG_FFMPEG_VDPAU \
$PKG_FFMPEG_RPI \ $PKG_FFMPEG_RPI \
$PKG_FFMPEG_RKMPP \ $PKG_FFMPEG_RKMPP \
--disable-dxva2 \
--enable-runtime-cpudetect \ --enable-runtime-cpudetect \
$PKG_FFMPEG_TABLES \ --disable-hardcoded-tables \
--disable-encoders \ --disable-encoders \
--enable-encoder=ac3 \ --enable-encoder=ac3 \
--enable-encoder=aac \ --enable-encoder=aac \
@ -201,8 +187,7 @@ configure_target() {
--disable-altivec \ --disable-altivec \
$PKG_FFMPEG_FPU \ $PKG_FFMPEG_FPU \
$PKG_FFMPEG_X86ASM \ $PKG_FFMPEG_X86ASM \
--disable-symver \ --disable-symver
--disable-programs
} }
post_makeinstall_target() { post_makeinstall_target() {