From 8bd59025927a8735b1188ca005abb1862cd2fd25 Mon Sep 17 00:00:00 2001 From: xufuji456 <839789740@qq.com> Date: Sat, 10 Jul 2021 09:48:40 +0800 Subject: [PATCH] update the configuration of version --- app/src/main/cpp/ffmpeg/config.h | 2 +- app/src/main/cpp/include/libavutil/ffversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/ffmpeg/config.h b/app/src/main/cpp/ffmpeg/config.h index 4acd8af..2cc27d7 100644 --- a/app/src/main/cpp/ffmpeg/config.h +++ b/app/src/main/cpp/ffmpeg/config.h @@ -3,7 +3,7 @@ #define FFMPEG_CONFIG_H #define FFMPEG_CONFIGURATION "--target-os=linux --prefix=../ffmpeg-android/armeabi-v7a --enable-cross-compile --arch=arm --cc=/Users/xufulong/Library/Android/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-gcc --cross-prefix=/Users/xufulong/Library/Android/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux-androideabi- --sysroot=/Users/xufulong/Library/Android/android-ndk-r15c/platforms/android-21/arch-arm --enable-neon --enable-hwaccels --enable-static --disable-shared --disable-doc --enable-asm --enable-small --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-debug --enable-gpl --disable-avdevice --disable-indevs --disable-outdevs --disable-avresample --extra-cflags='-Os -fpic -march=armv7-a -mcpu=cortex-a8 -mfpu=vfpv3-d16 -mfloat-abi=softfp -mthumb -I../ffmpeg-android/armeabi-v7a/include' --extra-ldflags='-lc -lm -ldl -llog -lgcc -lz -L../ffmpeg-android/armeabi-v7a/lib' --enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale --enable-avfilter --enable-network --enable-bsfs --enable-postproc --enable-filters --enable-encoders --enable-libmp3lame --enable-libx264 --enable-encoder='libmp3lame,libx264' --disable-decoders --enable-decoder='mjpeg,mpeg4,h263,h264,flv,hevc,wmv3,msmpeg4v3,msmpeg4v2,msvideo1,vc1,mpeg1video,mpeg2video,aac,ac3,ac3_fixed,m4a,amrnb,amrwb,vorbis,wmav2,truehd,tscc,tscc2,dvvideo,msrle,cinepak,indeo5,vp8,vp9,mp3float,mp3,mp3adufloat,mp3adu,mp3on4float,mp3on4,aac_fixed,aac_latm,eac3,png,wmav1,wmv1,wmv2,pcm_alaw,pcm_dvd,pcm_f16le,pcm_f24le,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,zlib,flac,opus,mlp,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32be,pcm_s32le,pcm_s64be,pcm_s64le,pcm_mulaw,alac,adpcm_ms,pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc,pcm_zork,adpcm_ima_qt,adpcm_ima_wav' --enable-muxers --enable-parsers --enable-protocols --disable-demuxers --enable-demuxer='aac,ac3,alaw,amr,amrnb,amrwb,ape,asf,asf_o,avi,cavsvideo,codec2,concat,dnxhd,eac3,flac,flv,gif,gif_pipe,h263,h264,hevc,hls,image2,image2pipe,jpeg_pipe,lrc,m4v,matroska,webm,mjpeg,mov,mp4,m4a,3gp,mp3,mpeg,mpegts,mv,ogg,png_pipe,realtext,rm,rtp,rtsp,s16be,s16le,s24be,s24le,s32be,s32le,sdp,srt,swf,u16be,u16le,u24be,u24le,u32be,u32le,vc1,wav,webm_dash,manifest,xmv,f32be,f32le,f64be,f64le,mpegvideo,mulaw,sami,srt' --cpu=armv7-a" #define FFMPEG_LICENSE "GPL version 2 or later" -#define CONFIG_THIS_YEAR 2019 +#define CONFIG_THIS_YEAR 2021 #define FFMPEG_DATADIR "../ffmpeg-android/armeabi-v7a/share/ffmpeg" #define AVCONV_DATADIR "../ffmpeg-android/armeabi-v7a/share/ffmpeg" #define CC_IDENT "gcc 4.9.x (GCC) 20150123 (prerelease)" diff --git a/app/src/main/cpp/include/libavutil/ffversion.h b/app/src/main/cpp/include/libavutil/ffversion.h index a17a10c..f4377b7 100644 --- a/app/src/main/cpp/include/libavutil/ffversion.h +++ b/app/src/main/cpp/include/libavutil/ffversion.h @@ -1,5 +1,5 @@ /* Automatically generated by version.sh, do not manually edit! */ #ifndef AVUTIL_FFVERSION_H #define AVUTIL_FFVERSION_H -#define FFMPEG_VERSION "r2.9.6-875-g7d430423d" +#define FFMPEG_VERSION "4.2" #endif /* AVUTIL_FFVERSION_H */