From e24313dac5fab23785d7f99c14fe7f71c686bda3 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Sat, 19 Oct 2019 23:16:22 +0300 Subject: [PATCH] Returning audio and subtitle decoders, as the demo app now displays this info --- ffmpeg-android-maker.sh | 8 +- video_decoders_list.txt | 217 ---------------------------------------- 2 files changed, 1 insertion(+), 224 deletions(-) delete mode 100644 video_decoders_list.txt diff --git a/ffmpeg-android-maker.sh b/ffmpeg-android-maker.sh index 5a3c589..f61af0b 100755 --- a/ffmpeg-android-maker.sh +++ b/ffmpeg-android-maker.sh @@ -154,10 +154,6 @@ function assemble() { # The name for compiler is slightly different, so it is defined separatly. CC=${TOOLCHAIN_PATH}/bin/${TARGET_TRIPLE_MACHINE_CC}-linux-${TARGET_TRIPLE_OS}${API_LEVEL}-clang - # Reading a list of video codecs to enable - DECODERS_TO_ENABLE= - while IFS= read -r line; do DECODERS_TO_ENABLE="${DECODERS_TO_ENABLE} --enable-decoder=$line"; done < ${BASE_DIR}/video_decoders_list.txt - # Everything that goes below ${EXTRA_BUILD_CONFIGURATION_FLAGS} is my project-specific. # You are free to enable/disable whatever you actually need. ./configure \ @@ -184,9 +180,7 @@ function assemble() { --disable-debug \ --disable-pthreads \ --disable-network \ - --disable-bsfs \ - --disable-decoders \ - ${DECODERS_TO_ENABLE} + --disable-bsfs make clean make -j8 diff --git a/video_decoders_list.txt b/video_decoders_list.txt deleted file mode 100644 index 26188ac..0000000 --- a/video_decoders_list.txt +++ /dev/null @@ -1,217 +0,0 @@ -aasc -aic -alias_pix -amv -anm -ansi -apng -asv1 -asv2 -aura -aura2 -avrn -avrp -avs -avui -ayuv -bethsoftvid -bfi -bintext -bitpacked -bmp -bmv_video -brender_pix -c93 -cavs -cdgraphics -cdxl -cfhd -cinepak -clearvideo -cljr -cllc -eacmv -cpia -cyuv -dds -dfa -dirac -dnxhd -dpx -dsicinvideo -dvvideo -dxa -dxtory -dxv -escape124 -escape130 -exr -ffv1 -ffvhuff -fic -fits -flashsv -flashsv2 -flic -flv -fmvc -fraps -frwu -g2m -gdv -gif -h261 -h263 -h263i -h263p -h264 -hap -hevc -hq_hqa -hqx -huffyuv -idf -imm4 -indeo2 -indeo3 -indeo4 -indeo5 -jpeg2000 -libopenjpeg -jpegls -jv -kgv1 -kmvc -lagarith -loco -m101 -eamad -magicyuv -mdec -mimic -mjpeg -mjpegb -mmvideo -motionpixels -mpeg1video -mpeg2video -mpegvideo -mpeg4 -msa1 -mscc -msmpeg4v1 -msmpeg4v2 -msrle -mss1 -mss2 -msvideo1 -mszh -mts2 -mvc1 -mvc2 -mwsc -mxpeg -nuv -paf_video -pam -pbm -pcx -pgm -pgmyuv -pictor -pixlet -png -ppm -prores -prosumer -psd -ptx -qdraw -qpeg -qtrle -r10k -r210 -rasc -rawvideo -rl2 -rpza -rscc -rv10 -rv20 -rv30 -rv40 -sanm -scpr -screenpresso -sgi -sgirle -sheervideo -smc -smvjpeg -snow -sp5x -speedhq -srgc -sunrast -svq1 -svq3 -targa -targa_y216 -tdsc -eatgq -eatgv -theora -thp -tiertexseqvideo -tiff -tmv -eatqi -truemotion1 -truemotion2 -truemotion2rt -tscc2 -txd -utvideo -v210 -v210x -v308 -v408 -v410 -vb -vble -vc1 -vc1image -vcr1 -xl -vmdvideo -vmnc -vp3 -vp5 -vp6 -vp6a -vp6f -vp7 -vp8 -vp9 -wcmv -webp -wmv1 -wmv2 -wmv3 -wmv3image -wnv1 -wrapped_avframe -xan_wc3 -xan_wc4 -xbin -xbm -xface -xpm -xwd -y41p -ylc -yop -yuv4 -zerocodec -zlib -zmbv