Skip to content

Commit f4072e0

Browse files
committed
update ffmpeg sources for 1.86.?
Edit: We are still at ffmpeg 4.2 after 2 years... Also only to git-2022-09-13-556758fd openssl got an update? dav1d looks to be the same old thing 0.6.0 + alot of stuff got removed... deadcode?
1 parent 556758f commit f4072e0

File tree

746 files changed

+58648
-468156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

746 files changed

+58648
-468156
lines changed

ffmpeg/JNI/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ TARGET=$1
88
COPY=0
99
BUILD=0
1010
PROFILE=0
11-
PLATFORM=19
11+
PLATFORM=21
1212

1313
MAKE=$NDK/ndk-build
1414

ffmpeg/JNI/config-ffmpeg.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ esac
156156
INC_OPENSSL=../openssl-1.0.2s/include
157157
INC_OPUS=../opus-1.1/include
158158
INC_SPEEX=../speex-1.2rc1/include
159-
INC_ZVBI=../zvbi-0.2.35/src
159+
#INC_ZVBI=../zvbi-0.2.35/src
160160
INC_ICONV=../modified_src/iconv
161161
INC_MXV=../modified_src/mxv
162162
INC_MXD=../modified_src/mxd
@@ -188,15 +188,15 @@ then
188188
elif [ $ARCH == 'arm' ]
189189
then
190190
CROSS_PREFIX=$TOOLCHAIN/bin/arm-linux-androideabi-
191-
AS=$TOOLCHAIN/bin/armv7a-linux-androideabi17-clang
192-
LD=$TOOLCHAIN/bin/armv7a-linux-androideabi17-clang
191+
AS=$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang
192+
LD=$TOOLCHAIN/bin/armv7a-linux-androideabi21-clang
193193

194194
EXTRA_CFLAGS+=" -fstack-protector -fstrict-aliasing"
195195
EXTRA_LDFLAGS+=" -march=$CPU"
196196

197197
if [ -n "${CLANG_VER}" ]
198198
then
199-
CLANG_TARGET=armv7-none-linux-androideabi17
199+
CLANG_TARGET=armv7a-none-linux-androideabi21
200200
fi
201201

202202
OPTFLAGS="-O2"
@@ -222,14 +222,14 @@ elif [ $ARCH == 'x86' ]
222222
then
223223
FFMPEG_CONFIGURATION="--disable-mmx --disable-mmxext --disable-inline-asm"
224224
CROSS_PREFIX=$TOOLCHAIN/bin/i686-linux-android-
225-
AS=$TOOLCHAIN/bin/i686-linux-android17-clang
226-
LD=$TOOLCHAIN/bin/i686-linux-android17-clang
225+
AS=$TOOLCHAIN/bin/i686-linux-android21-clang
226+
LD=$TOOLCHAIN/bin/i686-linux-android21-clang
227227

228228
EXTRA_CFLAGS+=" -fstrict-aliasing"
229229

230230
if [ -n "${CLANG_VER}" ]
231231
then
232-
CLANG_TARGET=i686-none-linux-android17
232+
CLANG_TARGET=i686-none-linux-android21
233233
EXTRA_CFLAGS+=" -fstack-protector-strong "
234234
fi
235235

@@ -245,6 +245,9 @@ then
245245
# LINK_AGAINST=15-mips
246246
fi
247247

248+
if [ ! -e ${CROSS_PREFIX}ar ]; then
249+
CROSS_PREFIX=${TOOLCHAIN}/bin/llvm-
250+
fi
248251

249252
if [ -n "${CLANG_VER}" ]
250253
then
@@ -373,7 +376,6 @@ FF_OUTDEP="\
373376
--enable-libmodplug \
374377
--enable-libopus \
375378
--enable-libspeex \
376-
--enable-libzvbi \
377379
--enable-openssl \
378380
--enable-zlib \
379381
--enable-libxml2 \
@@ -397,7 +399,7 @@ FFCOMPILER="\
397399
$EXTRA_PARAMETERS \
398400
"
399401

400-
EXTRA_CFLAGS+=" -I$INC_LIBMP3LAME -I$INC_ICONV -I$INC_MXV -I$INC_MXD -I$INC_USB -idirafter$INC_ZVBI -I$INC_OPENSSL -I$INC_OPUS -I$INC_SPEEX -I$INC_MODPLUG -I$INC_LIBMXL2 -I$INC_LIBSMB2 -I$INC_LIBDAV1D -DNDEBUG -DMXTECHS -DFF_API_AVPICTURE=1 -DCONFIG_MXV_FROM_MXVP=1 -DMXD_BUILTIN -ftree-vectorize -ffunction-sections -funwind-tables -fomit-frame-pointer -no-canonical-prefixes -pipe"
402+
EXTRA_CFLAGS+=" -I$INC_LIBMP3LAME -I$INC_ICONV -I$INC_MXV -I$INC_MXD -I$INC_USB -I$INC_OPENSSL -I$INC_OPUS -I$INC_SPEEX -I$INC_MODPLUG -I$INC_LIBMXL2 -I$INC_LIBSMB2 -I$INC_LIBDAV1D -DNDEBUG -DMXTECHS -DFF_API_AVPICTURE=1 -DCONFIG_MXV_FROM_MXVP=1 -DMXD_BUILTIN -ftree-vectorize -ffunction-sections -funwind-tables -fomit-frame-pointer -no-canonical-prefixes -pipe"
401403
EXTRA_LIBS=" -L$LIB_MX -lmxutil -lm -lc++_shared"
402404

403405
# Don't ask me why i need bash here when its already #!/bin/bash. This fixes ffmpeg ./configure: 1283: shift: can't shift that many
-41.3 KB
Binary file not shown.

ffmpeg/JNI/dav1d/builddir/.ninja_log

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)