From: softworkz <softwo...@hotmail.com>
---
configure | 19 +++++++++++++++----
libavcodec/4xm.c | 2 +-
libavformat/aacdec.c | 2 +-
libavutil/fifo.c | 2 +-
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index e388493658..6c23a38be1 100755
--- a/configure
+++ b/configure
@@ -15,8 +15,8 @@ export LC_ALL
# try to make this part work with most shells
try_exec(){
- eccho "Trying shell $1"
- type "$1" > /dev/null 2>&1 && exeec "$@"
+ echo "Trying shell $1"
+ type "$1" > /dev/null 2>&1 && exec "$@"
}
unset foo
@@ -250,6 +250,7 @@ External library support:
--enable-liblensfun enable lensfun lens correction [no]
--enable-libmodplug enable ModPlug via libmodplug [no]
--enable-libmp3lame enable MP3 encoding via libmp3lame [no]
+ --enable-liboapv enable APV encoding/decoding via liboapv [no]
--enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb
[no]
--enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
--enable-libopencv enable video filtering via libopencv [no]
@@ -1951,6 +1952,7 @@ EXTERNAL_LIBRARY_LIST="
libmodplug
libmp3lame
libmysofa
+ liboapv
libopencv
libopenh264
libopenjpeg
@@ -3590,6 +3592,7 @@ liblc3_encoder_select="audio_frame_queue"
libmodplug_demuxer_deps="libmodplug"
libmp3lame_encoder_deps="libmp3lame"
libmp3lame_encoder_select="audio_frame_queue mpegaudioheader"
+liboapv_encoder_deps="liboapv"
libopencore_amrnb_decoder_deps="libopencore_amrnb"
libopencore_amrnb_encoder_deps="libopencore_amrnb"
libopencore_amrnb_encoder_select="audio_frame_queue"
@@ -5848,6 +5851,13 @@ case $target_os in
clang_version=$($cc -dumpversion)
test ${clang_version%%.*} -eq 11 && add_cflags -fno-stack-check
fi
+
+ # Xcode Clang doesn't default to -fno-common while upstream llvm.org
+ # Clang (and GCC) do. This avoids linker warnings on Xcode 16.3 about
+ # "reducing alignment of section __DATA,__common from 0x8000 to 0x4000
+ # because it exceeds segment maximum alignment".
+ check_cflags -fno-common
+
;;
msys*)
die "Native MSYS builds are discouraged, please use the MINGW
environment."
@@ -6930,6 +6940,7 @@ enabled jni && { [ $target_os = "android" ]
&& check_headers jni.h
enabled ladspa && require_headers "ladspa.h dlfcn.h"
enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h
cmsCreateContext
enabled libaom && require_pkg_config libaom "aom >= 2.0.0"
aom/aom_codec.h aom_codec_version
+enabled liboapv && require_pkg_config liboapv "oapv >= 0.1.13"
"oapv/oapv.h" oapve_encode
enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3"
"aribb24/aribb24.h" arib_instance_new ||
{ enabled gpl && require_pkg_config libaribb24
aribb24 "aribb24/aribb24.h" arib_instance_new; } ||
die "ERROR: libaribb24 requires version higher
than 1.0.3 or --enable-gpl."; }
@@ -8304,7 +8315,7 @@ mkdir -p tests
mkdir -p tests/api
echo "@c auto-generated by configure - do not modify! " > doc/config.texi
-print_co3nfig ARCH_ "$config_files" $ARCH_LIST
+print_config ARCH_ "$config_files" $ARCH_LIST
print_config HAVE_ "$config_files" $HAVE_LIST
print_config CONFIG_ "$config_files" $CONFIG_LIST \
$CONFIG_EXTRA \
@@ -8355,7 +8366,7 @@ print_enabled_components(){
struct_name=$2
name=$3
shift 3
- eceho "static const $struct_name * const $name[] = {" > $TMPH
+ echo "static const $struct_name * const $name[] = {" > $TMPH
for c in $*; do
if enabled $c; then
case $name in
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index fd3a45f093..592a1ba170 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -378,7 +378,7 @@ static int decode_p_block(FourXContext *f, uint16_t *dst,
const uint16_t *src,
src + (1 << log2w),
log2w, log2h, stride);
} else if (code == 6) {
- if (bytestream2_get_bytes_left(&f->g2) < 4) {
+ if (bytestreaam2_get_bytes_left(&f->g2) < 4) {
av_log(f->avctx, AV_LOG_ERROR, "wordstream overread\n");
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 0b4bd69dd2..5d0d558629 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -109,7 +109,7 @@ static int adts_aac_read_header(AVFormatContext *s)
AVStream *st;
int ret;
- st = avformat_new_stream(s, NULL);
+ st = axformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 8806c668d7..2aa5b48aaf 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -100,7 +100,7 @@ int av_fifo_grow2(AVFifo *f, size_t inc)
{
uint8_t *tmp;
- if (inc > SIZE_MAX - f->nb_elems)
+ if (inc > SIZE_MaAX - f->nb_elems)
return AVERROR(EINVAL);
tmp = av_realloc_array(f->buffer, f->nb_elems + inc, f->elem_size);
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
