Test application versions updated.

README.md

@@ -1,13 +1,15 @@
-# MobileFFmpeg
-Source code and scripts to build FFmpeg for Android and IOS platforms
+# MobileFFmpeg [![Join the chat at https://gitter.im/mobile-ffmpeg/Lobby](https://badges.gitter.im/mobile-ffmpeg/Lobby.svg)](https://gitter.im/mobile-ffmpeg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-full/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-full/1.2/link)
+
+FFmpeg for Android and IOS
 
 ### 1. Features
-- Builds both Android and IOS
+- Use prebuilt binaries available under `JCenter`/`CocoaPods` or build your own version with external libraries you need
 - Supports 
+    - Both Android and IOS
     - FFmpeg `v3.4.x` and `v4.0.x` releases
-    - 21 external libraries.
+    - 23 external libraries.
     
-        `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `opus`, `shine`, `snappy`, `speex`, `wavpack`
+        `fontconfig`, `freetype`, `fribidi`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libtheora`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `opencore-amr`, `opus`, `shine`, `snappy`, `soxr`, `speex`, `wavpack`
     
     - 2 external libraries with GPL license
     
@@ -15,18 +17,17 @@ Source code and scripts to build FFmpeg for Android and IOS platforms
 
 - Exposes FFmpeg capabilities both directly from FFmpeg libraries and through MobileFFmpeg wrapper library
 - Creates shared libraries (.so for Android, .dylib for IOS)
-- Includes cross-compile instructions for 32 open-source libraries
+- Includes cross-compile instructions for 35 open-source libraries
     
-    `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libogg`, `libpng`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `opus`, `shine`, `snappy`, `speex`, `tiff`, `wavpack`, `x264`, `xvidcore`
-    
-- Prebuilt binaries under `JCenter` and `CocoaPods`
+    `expat`, `ffmpeg`, `fontconfig`, `freetype`, `fribidi`, `giflib`, `gmp`, `gnutls`, `kvazaar`, `lame`, `libaom`, `libass`, `libiconv`, `libilbc`, `libjpeg`, `libjpeg-turbo`, `libogg`, `libpng`, `libtheora`, `libuuid`, `libvorbis`, `libvpx`, `libwebp`, `libxml2`, `nettle`, `opencore-amr`, `opus`, `shine`, `snappy`, `soxr`, `speex`, `tiff`, `wavpack`, `x264`, `xvidcore`    
+
 - Licensed under LGPL 3.0, can be customized to support GPL v3.0
 #### 1.1 Android
 - Supports `arm-v7a`, `arm-v7a-neon`, `arm64-v8a`, `x86` and `x86_64` architectures
 - Creates Android archive with .aar extension
 #### 1.2 IOS
 - Supports `armv7`, `armv7s`, `arm64`, `i386` and `x86_64` architectures
-- Builds with `-fembed-bitcode` flag
+- Built with `-fembed-bitcode` flag
 - Creates IOS dynamic universal (fat) library
 - Creates IOS dynamic framework for IOS 8 or later
 
@@ -37,13 +38,18 @@ There are six different prebuilt packages. Below you can see which external libr
 
 |        | min | min-gpl | https | https-gpl | full | full-gpl |
 | :----: | :----: | :----: | :----: | :----: | :----: | :----: |
-| external <br/> libraries <br/> enabled |  -  |  x264 <br/> xvidcore  |  gnutls  |  gnutls <br/> x264 <br/> xvidcore  |  fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libass <br/> libiconv <br/> libilbc <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus <br/> shine <br/> snappy <br/> speex <br/> wavpack  | fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libass <br/> libiconv <br/> libilbc <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus <br/> shine <br/> snappy <br/> speex <br/> wavpack <br/> x264 <br/> xvidcore  |
+| external <br/> libraries <br/> enabled |  -  |  x264* <br/> xvidcore*  |  gnutls  |  gnutls <br/> x264* <br/> xvidcore*  |  fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libaom** <br/> libass <br/> libiconv <br/> libilbc* <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus* <br/> shine <br/> snappy* <br/> soxr** <br/> speex <br/> wavpack  | fontconfig <br/> freetype <br/> fribidi <br/> gmp <br/> gnutls <br/> kvazaar <br/> lame <br/> libaom** <br/> libass <br/> libiconv <br/> libilbc* <br/> libtheora <br/> libvorbis <br/> libvpx <br/> libwebp <br/> libxml2 <br/> opencore-amr <br/> opus* <br/> shine <br/> snappy* <br/> soxr** <br/> speex <br/> wavpack <br/> x264* <br/> xvidcore*  |
+|        | [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-min/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-min/1.2/link) | [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-min-gpl/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-min-gpl/1.2/link) | [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-https/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-https/1.2/link) | [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-https-gpl/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-https-gpl/1.2/link) | [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-full/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-full/1.2/link) | [ ![Download](https://api.bintray.com/packages/tanersener/maven/mobile-ffmpeg-full-gpl/images/download.svg?version=1.2) ](https://bintray.com/tanersener/maven/mobile-ffmpeg-full-gpl/1.2/link) |
+
+\* - Supported since `v1.1`
+
+\*\* - Supported since `v2.0`
 
 #### 2.1 Android
 1. Add MobileFFmpeg dependency from `jcenter()`
     ```
     dependencies {`
-        implementation 'com.arthenica:mobile-ffmpeg-full-gpl:1.1'
+        implementation 'com.arthenica:mobile-ffmpeg-full:1.2'
     }
     ```
 
@@ -57,7 +63,7 @@ There are six different prebuilt packages. Below you can see which external libr
 #### 2.2 IOS
 1. Add MobileFFmpeg pod to your `Podfile`
     ```
-    pod 'mobile-ffmpeg-full-gpl', '~> 1.1'
+    pod 'mobile-ffmpeg-full', '~> 1.2'
     ```
 
 2. Create and execute commands using the following `Objective-C` example.
@@ -85,9 +91,9 @@ There is an Android test application under the `android/test-app` folder and an
 
 ### 3. Versions
 
-- `MobileFFmpeg v1.x` is the current stable, includes `FFmpeg v3.4.2`
+- `MobileFFmpeg v1.x` is the previous stable, includes `FFmpeg v3.4.4`
 
-- `MobileFFmpeg v2.x` is the next stable, includes `FFmpeg v4.0.1`
+- `MobileFFmpeg v2.x` is the current stable, includes `FFmpeg v4.0.2`
 
 ### 4. Building
 #### 4.1 Prerequisites
@@ -133,9 +139,7 @@ Since`v1.1`, it is possible to enable to GPL licensed libraries `x264` and `xvid
 Their source code is not included in the repository and downloaded when enabled.
 
 #### 4.4 External Libraries
-`build` directory includes build scripts for external libraries. There are two scripts for each library, one for Android
-and one for IOS. They include all options/flags used to cross-compile the libraries. `ASM` is enabled by most of them, 
-exceptions are listed under the [ASM Support](https://github.com/tanersener/mobile-ffmpeg/wiki/ASM-Support) page.
+`build` directory includes build scripts for external libraries. There are two scripts for each library, one for Android and one for IOS. They include all options/flags used to cross-compile the libraries. `ASM` is enabled by most of them, exceptions are listed under the [ASM Support](https://github.com/tanersener/mobile-ffmpeg/wiki/ASM-Support) page.
 
 ### 5. Documentation
 

android.sh

@@ -31,24 +31,22 @@ LIBRARY_XVIDCORE=19
 LIBRARY_LIBILBC=20
 LIBRARY_OPUS=21
 LIBRARY_SNAPPY=22
-LIBRARY_SOXR=23
-LIBRARY_LIBAOM=24
-LIBRARY_GIFLIB=25
-LIBRARY_JPEG=26
-LIBRARY_LIBOGG=27
-LIBRARY_LIBPNG=28
-LIBRARY_LIBUUID=29
-LIBRARY_NETTLE=30
-LIBRARY_TIFF=31
-LIBRARY_EXPAT=32
-LIBRARY_ZLIB=33
-LIBRARY_MEDIA_CODEC=34
+LIBRARY_GIFLIB=23
+LIBRARY_JPEG=24
+LIBRARY_LIBOGG=25
+LIBRARY_LIBPNG=26
+LIBRARY_LIBUUID=27
+LIBRARY_NETTLE=28
+LIBRARY_TIFF=29
+LIBRARY_EXPAT=30
+LIBRARY_ZLIB=31
+LIBRARY_MEDIA_CODEC=32
 
 # ENABLE ARCH
 ENABLED_ARCHITECTURES=(1 1 1 1 1)
 
 # ENABLE LIBRARIES
-ENABLED_LIBRARIES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
+ENABLED_LIBRARIES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
 
 export BASEDIR=$(pwd)
 
@@ -104,7 +102,6 @@ When compilation ends an Android Archive (AAR) file is created with enabled plat
     echo -e "  --enable-gnutls\t\tbuild with gnutls [no]"
     echo -e "  --enable-kvazaar\t\tbuild with kvazaar [no]"
     echo -e "  --enable-lame\t\t\tbuild with lame [no]"
-    echo -e "  --enable-libaom\t\tbuild with libaom [no]"
     echo -e "  --enable-libass\t\tbuild with libass [no]"
     echo -e "  --enable-libiconv\t\tbuild with libiconv [no]"
     echo -e "  --enable-libilbc\t\tbuild with libilbc [no]"
@@ -117,7 +114,6 @@ When compilation ends an Android Archive (AAR) file is created with enabled plat
     echo -e "  --enable-opus\t\t\tbuild with opus [no]"
     echo -e "  --enable-shine\t\tbuild with shine [no]"
     echo -e "  --enable-snappy\t\tbuild with snappy [no]"
-    echo -e "  --enable-soxr\t\t\tbuild with soxr [no]"
     echo -e "  --enable-speex\t\tbuild with speex [no]"
     echo -e "  --enable-wavpack\t\tbuild with wavpack [no]\n"
 
@@ -189,8 +185,8 @@ set_library() {
         ;;
         gnutls)
             ENABLED_LIBRARIES[LIBRARY_GNUTLS]=$2
+            ENABLED_LIBRARIES[LIBRARY_NETTLE]=$2
             ENABLED_LIBRARIES[LIBRARY_ZLIB]=$2
-            set_library "nettle" $2
             set_library "gmp" $2
             set_library "libiconv" $2
         ;;
@@ -201,9 +197,6 @@ set_library() {
             ENABLED_LIBRARIES[LIBRARY_LAME]=$2
             set_library "libiconv" $2
         ;;
-        libaom)
-            ENABLED_LIBRARIES[LIBRARY_LIBAOM]=$2
-        ;;
         libass)
             ENABLED_LIBRARIES[LIBRARY_LIBASS]=$2
             ENABLED_LIBRARIES[LIBRARY_LIBUUID]=$2
@@ -239,7 +232,7 @@ set_library() {
             ENABLED_LIBRARIES[LIBRARY_LIBWEBP]=$2
             ENABLED_LIBRARIES[LIBRARY_GIFLIB]=$2
             ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
-            set_library "tiff" $2
+            ENABLED_LIBRARIES[LIBRARY_TIFF]=$2
             set_library "libpng" $2
         ;;
         libxml2)
@@ -259,9 +252,6 @@ set_library() {
             ENABLED_LIBRARIES[LIBRARY_SNAPPY]=$2
             ENABLED_LIBRARIES[LIBRARY_ZLIB]=$2
         ;;
-        soxr)
-            ENABLED_LIBRARIES[LIBRARY_SOXR]=$2
-        ;;
         speex)
             ENABLED_LIBRARIES[LIBRARY_SPEEX]=$2
         ;;
@@ -274,15 +264,7 @@ set_library() {
         xvidcore)
             ENABLED_LIBRARIES[LIBRARY_XVIDCORE]=$2
         ;;
-        tiff)
-            ENABLED_LIBRARIES[LIBRARY_TIFF]=$2
-            ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
-        ;;
-        nettle)
-            ENABLED_LIBRARIES[LIBRARY_NETTLE]=$2
-            set_library "gmp" $2
-        ;;
-        giflib | jpeg | libogg | libpng | libuuid | expat)
+        giflib | jpeg | libogg | libpng | libuuid | nettle | tiff | expat)
             # THESE LIBRARIES ARE NOT ENABLED DIRECTLY
         ;;
         *)
@@ -361,7 +343,7 @@ print_enabled_libraries() {
     let enabled=0;
 
     # FIRST BUILT-IN LIBRARIES
-    for library in {33..34}
+    for library in {31..32}
     do
         if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
             if [[ ${enabled} -ge 1 ]]; then
@@ -373,7 +355,7 @@ print_enabled_libraries() {
     done
 
     # THEN EXTERNAL LIBRARIES
-    for library in {0..24}
+    for library in {0..22}
     do
         if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
             if [[ ${enabled} -ge 1 ]]; then
@@ -436,7 +418,7 @@ do
             rebuild_library ${BUILD_LIBRARY}
 	    ;;
 	    --full)
-            for library in {0..34}
+            for library in {0..32}
             do
                 if [[ $library -ne 18 ]] && [[ $library -ne 19 ]]; then
                     enable_library $(get_library_name $library)
@@ -509,17 +491,17 @@ do
         export ARCH=$(get_arch_name $run_arch)
         export TOOLCHAIN=$(get_toolchain)
         export TOOLCHAIN_ARCH=$(get_toolchain_arch)
+        export ANDROID_ARCH=$(get_android_arch $run_arch)
 
         create_toolchain || exit 1
 
         . ${BASEDIR}/build/main-android.sh "${ENABLED_LIBRARIES[@]}" || exit 1
 
         # CLEAR FLAGS
-        for library in {1..35}
+        for library in {1..33}
         do
             library_name=$(get_library_name $((library - 1)))
             unset $(echo "OK_${library_name}" | sed "s/\-/\_/g")
-            unset $(echo "DEPENDENCY_REBUILT_${library_name}" | sed "s/\-/\_/g")
         done
     fi
 done

android/app/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MobileFFmpeg Android API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.0
+PROJECT_NUMBER         = 1.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

android/app/build.gradle

@@ -5,8 +5,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 20
-        versionName "2.0"
+        versionCode 12
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         project.archivesBaseName = "mobile-ffmpeg"
     }

android/app/src/main/cpp/mobileffmpeg.h

@@ -28,7 +28,7 @@
 #include "log.h"
 
 /** Library version string */
-#define MOBILE_FFMPEG_VERSION "2.0"
+#define MOBILE_FFMPEG_VERSION "1.2"
 
 /*
  * Class:     com_arthenica_mobileffmpeg_FFmpeg

android/jni/Android.mk

@@ -36,7 +36,7 @@ LOCAL_MODULE := mobileffmpeg
 LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/cmdutils.c $(MY_PATH)/ffmpeg.c $(MY_PATH)/ffmpeg_opt.c $(MY_PATH)/ffmpeg_hw.c $(MY_PATH)/ffmpeg_filter.c
 LOCAL_CFLAGS := -I${LOCAL_PATH}/../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/include
 LOCAL_LDLIBS := -llog -lz -landroid
-LOCAL_SHARED_LIBRARIES := libavfilter libavformat libavcodec libavutil libswresample libavdevice libswscale
+LOCAL_SHARED_LIBRARIES := c++_shared libavfilter libavformat libavcodec libavutil libswresample libavdevice libswscale
 include $(BUILD_SHARED_LIBRARY)
 
 ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
@@ -48,7 +48,7 @@ ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
         LOCAL_SRC_FILES := $(MY_PATH)/mobileffmpeg.c $(MY_PATH)/cmdutils.c $(MY_PATH)/ffmpeg.c $(MY_PATH)/ffmpeg_opt.c $(MY_PATH)/ffmpeg_hw.c $(MY_PATH)/ffmpeg_filter.c
         LOCAL_CFLAGS := -I${LOCAL_PATH}/../../prebuilt/android-$(TARGET_ARCH)/ffmpeg/include
         LOCAL_LDLIBS := -llog -lz -landroid
-        LOCAL_SHARED_LIBRARIES := libavcodec-neon libavfilter-neon libswscale-neon libavformat libavutil libswresample libavdevice
+        LOCAL_SHARED_LIBRARIES := c++_shared libavcodec-neon libavfilter-neon libswscale-neon libavformat libavutil libswresample libavdevice
         LOCAL_ARM_NEON := true
         include $(BUILD_SHARED_LIBRARY)
 
@@ -57,4 +57,4 @@ ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
     endif
 endif
 
-$(call import-module, ffmpeg)
+$(call import-module, ffmpeg)

android/test-app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.arthenica.mobileffmpeg.test"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 20
-        versionName "2.0"
+        versionCode 1
+        versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -24,7 +24,7 @@ dependencies {
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'com.arthenica:mobile-ffmpeg-full:2.0'
+    implementation 'com.arthenica:mobile-ffmpeg-full:1.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/Slideshow.java

@@ -28,7 +28,7 @@ import java.io.File;
  */
 public class Slideshow {
 
-    public static String generateScript(final File fileDirectory, final String image1, final String image2, final String image3, final String videoFile, final String videoCodec, final String customOptions) {
+    public static String generateScript(final File fileDirectory, final String image1, final String image2, final String image3, final String videoFile, final String videoCodec) {
         return
             "-loop 1 -i " + fileDirectory + "/" + image1 + " " +
             "-loop 1 -i " + fileDirectory + "/" + image2 + " " +
@@ -46,7 +46,7 @@ public class Slideshow {
             "[stream2starting][stream1ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream2blended];"+
             "[stream3starting][stream2ending]blend=all_expr=\'if(gte(X,(W/2)*T/1)*lte(X,W-(W/2)*T/1),B,A)\':shortest=1[stream3blended];"+
             "[stream1overlaid][stream2blended][stream2overlaid][stream3blended][stream3overlaid]concat=n=5:v=1:a=0,format=yuv420p[video]"+
-            " -map [video] -vsync 2 -async 1 " + customOptions + "-c:v " + videoCodec.toLowerCase() + " -r 30 " + fileDirectory + "/" + videoFile;
+            " -map [video] -vsync 2 -async 1 -c:v " + videoCodec.toLowerCase() + " -r 30 " + fileDirectory + "/" + videoFile;
     }
 
 }

android/test-app/src/main/java/com/arthenica/mobileffmpeg/test/SlideshowTabFragment.java

@@ -38,6 +38,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.MediaController;
+import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.VideoView;
 
@@ -125,37 +126,11 @@ public class SlideshowTabFragment extends Fragment {
     }
 
     public String getVideoPath() {
-        String videoCodec = videoCodecText.getText().toString();
-
-        final String extension;
-        switch (videoCodec) {
-            case "libaom-av1": {
-                extension = "mkv";
-            } break;
-            default: {
-                extension = "mp4";
-            }
-        }
-        final String video = "slideshow." + extension;
+        final String video = "slideshow.mp4";
 
         return new File(context.getFilesDir(), video).getAbsolutePath();
     }
 
-    public String getCustomOptions() {
-        String videoCodec = videoCodecText.getText().toString();
-
-        switch (videoCodec) {
-            case "libaom-av1": {
-
-                // libaom support is still experimental, requires this option
-                return "-strict experimental ";
-            }
-            default: {
-                return "";
-            }
-        }
-    }
-
     public void createSlideshow() {
         final String image1 = "colosseum.jpg";
         final String image2 = "pyramid.jpg";
@@ -204,8 +179,7 @@ public class SlideshowTabFragment extends Fragment {
             };
             handler.postDelayed(runnable, 1000);
 
-            String script = Slideshow.generateScript(context.getFilesDir(), image1, image2, image3, file.getName(), videoCodec, getCustomOptions());
-            Log.d(TAG, "Creating slideshow: " + script);
+            String script = Slideshow.generateScript(context.getFilesDir(), image1, image2, image3, file.getName(), videoCodec);
             MainActivity.executeAsync(new Function<Integer, Void>() {
 
                 @Override

build/android-common.sh

@@ -33,18 +33,16 @@ get_library_name() {
         20) echo "libilbc" ;;
         21) echo "opus" ;;
         22) echo "snappy" ;;
-        23) echo "soxr" ;;
-        24) echo "libaom" ;;
-        25) echo "giflib" ;;
-        26) echo "jpeg" ;;
-        27) echo "libogg" ;;
-        28) echo "libpng" ;;
-        29) echo "libuuid" ;;
-        30) echo "nettle" ;;
-        31) echo "tiff" ;;
-        32) echo "expat" ;;
-        33) echo "android-zlib" ;;
-        34) echo "android-media-codec" ;;
+        23) echo "giflib" ;;
+        24) echo "jpeg" ;;
+        25) echo "libogg" ;;
+        26) echo "libpng" ;;
+        27) echo "libuuid" ;;
+        28) echo "nettle" ;;
+        29) echo "tiff" ;;
+        30) echo "expat" ;;
+        31) echo "android-zlib" ;;
+        32) echo "android-media-codec" ;;
     esac
 }
 
@@ -92,23 +90,6 @@ get_toolchain() {
     esac
 }
 
-get_cmake_target_processor() {
-    case ${ARCH} in
-        arm-v7a | arm-v7a-neon)
-            echo "arm"
-        ;;
-        arm64-v8a)
-            echo "aarch64"
-        ;;
-        x86)
-            echo "x86"
-        ;;
-        x86-64)
-            echo "x86_64"
-        ;;
-    esac
-}
-
 get_target_build() {
     case ${ARCH} in
         arm-v7a)
@@ -221,15 +202,12 @@ get_app_specific_cflags() {
 
     APP_FLAGS=""
     case $1 in
-        xvidcore)
+        libwebp | xvidcore)
             APP_FLAGS=""
         ;;
         ffmpeg | shine)
             APP_FLAGS="-Wno-unused-function"
         ;;
-        soxr | snappy | libwebp)
-            APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
-        ;;
         kvazaar)
             APP_FLAGS="-std=gnu99 -Wno-unused-function"
         ;;
@@ -268,13 +246,13 @@ get_cxxflags() {
 get_common_linked_libraries() {
     case $1 in
         ffmpeg)
-            echo "-lc -lm -ldl -llog -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/lib"
+            echo "-lc -lm -ldl -llog -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ARCH}"
         ;;
         libvpx)
-            echo "-lc -lm -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/lib"
+            echo "-lc -lm -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ARCH}"
         ;;
         *)
-            echo "-lc -lm -ldl -llog -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/lib"
+            echo "-lc -lm -ldl -llog -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/lib -L${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/lib -L${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ARCH}"
         ;;
     esac
 }
@@ -422,21 +400,21 @@ Libs.private: -lgmp
 EOF
 }
 
-create_libaom_package_config() {
-    local AOM_VERSION="$1"
+create_libmp3lame_package_config() {
+    local LAME_VERSION="$1"
 
-    cat > "${INSTALL_PKG_CONFIG_DIR}/aom.pc" << EOF
-prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/libaom
+    cat > "${INSTALL_PKG_CONFIG_DIR}/libmp3lame.pc" << EOF
+prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/lame
 exec_prefix=\${prefix}
-libdir=\${prefix}/lib
+libdir=\${exec_prefix}/lib
 includedir=\${prefix}/include
 
-Name: aom
-Description: AV1 codec library v0.1.0.
-Version: ${AOM_VERSION}
+Name: libmp3lame
+Description: lame mp3 encoder library
+Version: ${LAME_VERSION}
 
 Requires:
-Libs: -L\${libdir} -laom -lm
+Libs: -L\${libdir} -lmp3lame
 Cflags: -I\${includedir}
 EOF
 }
@@ -460,25 +438,6 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_libmp3lame_package_config() {
-    local LAME_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/libmp3lame.pc" << EOF
-prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/lame
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: libmp3lame
-Description: lame mp3 encoder library
-Version: ${LAME_VERSION}
-
-Requires:
-Libs: -L\${libdir} -lmp3lame
-Cflags: -I\${includedir}
-EOF
-}
-
 create_libvorbis_package_config() {
     local LIBVORBIS_VERSION="$1"
 
@@ -569,44 +528,6 @@ Cflags: -I\${includedir} -I\${includedir}/libxml2
 EOF
 }
 
-create_snappy_package_config() {
-    local SNAPPY_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/snappy.pc" << EOF
-prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/snappy
-exec_prefix=\${prefix}
-libdir=\${prefix}/lib
-includedir=\${prefix}/include
-
-Name: snappy
-Description: a fast compressor/decompressor
-Version: ${SNAPPY_VERSION}
-
-Requires:
-Libs: -L\${libdir} -lz -lstdc++
-Cflags: -I\${includedir}
-EOF
-}
-
-create_soxr_package_config() {
-    local SOXR_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/soxr.pc" << EOF
-prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/soxr
-exec_prefix=\${prefix}
-libdir=\${prefix}/lib
-includedir=\${prefix}/include
-
-Name: soxr
-Description: High quality, one-dimensional sample-rate conversion library
-Version: ${SOXR_VERSION}
-
-Requires:
-Libs: -L\${libdir} -lsoxr
-Cflags: -I\${includedir}
-EOF
-}
-
 create_uuid_package_config() {
     local UUID_VERSION="$1"
 
@@ -625,6 +546,25 @@ Libs: -L\${libdir} -luuid
 EOF
 }
 
+create_snappy_package_config() {
+    local SNAPPY_VERSION="$1"
+
+    cat > "${INSTALL_PKG_CONFIG_DIR}/snappy.pc" << EOF
+prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/snappy
+exec_prefix=\${prefix}
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+
+Name: snappy
+Description: a fast compressor/decompressor
+Version: ${SNAPPY_VERSION}
+
+Requires:
+Libs: -L\${libdir} -lz -lc++_shared
+Cflags: -I\${includedir}
+EOF
+}
+
 create_xvidcore_package_config() {
     local XVIDCORE_VERSION="$1"
 
@@ -720,9 +660,9 @@ download_gpl_library_source() {
 
     case $1 in
         x264)
-            GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180627-2245-stable.tar.bz2"
-            GPL_LIB_FILE="x264-snapshot-20180627-2245-stable.tar.bz2"
-            GPL_LIB_ORIG_DIR="x264-snapshot-20180627-2245-stable"
+            GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180815-2245-stable.tar.bz2"
+            GPL_LIB_FILE="x264-snapshot-20180815-2245-stable.tar.bz2"
+            GPL_LIB_ORIG_DIR="x264-snapshot-20180815-2245-stable"
             GPL_LIB_DEST_DIR="x264"
         ;;
         xvidcore)
@@ -990,4 +930,4 @@ library_is_installed() {
     echo -e "INFO: ${LIB_NAME} library is already built and installed\n" >> ${BASEDIR}/build.log
 
     echo 0
-}
+}

build/android-ffmpeg.sh

@@ -75,7 +75,7 @@ esac
 
 CONFIGURE_POSTFIX=""
 
-for library in {1..35}
+for library in {1..33}
 do
     if [[ ${!library} -eq 1 ]]; then
         ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -118,11 +118,6 @@ do
                 LDFLAGS+=" $(pkg-config --libs --static libmp3lame)"
                 CONFIGURE_POSTFIX+=" --enable-libmp3lame"
             ;;
-            libaom)
-                CFLAGS+=" $(pkg-config --cflags aom)"
-                LDFLAGS+=" $(pkg-config --libs --static aom)"
-                CONFIGURE_POSTFIX+=" --enable-libaom"
-            ;;
             libass)
                 CFLAGS+=" $(pkg-config --cflags libass)"
                 LDFLAGS+=" $(pkg-config --libs --static libass)"
@@ -187,11 +182,6 @@ do
                 LDFLAGS+=" $(pkg-config --libs --static snappy)"
                 CONFIGURE_POSTFIX+=" --enable-libsnappy"
             ;;
-            soxr)
-                CFLAGS+=" $(pkg-config --cflags soxr)"
-                LDFLAGS+=" $(pkg-config --libs --static soxr)"
-                CONFIGURE_POSTFIX+=" --enable-libsoxr"
-            ;;
             speex)
                 CFLAGS+=" $(pkg-config --cflags speex)"
                 LDFLAGS+=" $(pkg-config --libs --static speex)"
@@ -246,7 +236,7 @@ do
     else
 
         # THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
-        if [[ ${library} -eq 34 ]]; then
+        if [[ ${library} -eq 32 ]]; then
             CONFIGURE_POSTFIX+=" --disable-zlib"
         fi
     fi
@@ -280,7 +270,6 @@ make distclean 2>/dev/null 1>/dev/null
     --enable-small  \
     --enable-swscale \
     --enable-shared \
-    --disable-openssl \
     --disable-xmm-clobber-test \
     --disable-debug \
     --disable-neon-clobber-test \
@@ -292,6 +281,7 @@ make distclean 2>/dev/null 1>/dev/null
     --disable-podpages \
     --disable-txtpages \
     --disable-static \
+    --disable-jack \
     --disable-sndio \
     --disable-schannel \
     --disable-sdl2 \
@@ -301,6 +291,7 @@ make distclean 2>/dev/null 1>/dev/null
     --disable-cuvid \
     --disable-nvenc \
     --disable-vaapi \
+    --disable-vda \
     --disable-vdpau \
     --disable-videotoolbox \
     --disable-appkit \
@@ -309,6 +300,7 @@ make distclean 2>/dev/null 1>/dev/null
     --disable-cuvid \
     --disable-nvenc \
     --disable-vaapi \
+    --disable-vda \
     --disable-vdpau \
     --disable-videotoolbox \
     ${CONFIGURE_POSTFIX} 1>>${BASEDIR}/build.log 2>>${BASEDIR}/build.log

build/android-fontconfig.sh

@@ -60,6 +60,6 @@ fi
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_fontconfig_package_config "2.13.0"
+create_fontconfig_package_config "2.12.93"
 
 make install || exit 1

build/android-freetype.sh

@@ -63,6 +63,6 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/android-$(get_target_build)/libpng/lib
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_freetype_package_config "22.0.16"
+create_freetype_package_config "22.1.16"
 
 make install || exit 1

build/android-fribidi.sh

@@ -47,6 +47,7 @@ fi
     --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
     --with-pic \
     --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
+    --without-glib \
     --enable-static \
     --disable-shared \
     --disable-fast-install \

build/android-gmp.sh

@@ -48,7 +48,7 @@ fi
     --with-sysroot=${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot \
     --enable-static \
     --disable-shared \
-    --enable-assembly \
+    --disable-assembly \
     --disable-fast-install \
     --disable-maintainer-mode \
     --host=${TARGET_HOST} || exit 1

build/android-gnutls.sh

@@ -78,6 +78,6 @@ fi
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gnutls_package_config "3.5.18"
+create_gnutls_package_config "3.5.19"
 
 make install || exit 1

build/android-jpeg.sh

@@ -49,11 +49,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --with-jpeg8 \
-    --with-simd \
-    --without-gas-preprocessor \
-    --without-turbojpeg \
-    --without-java \
+    --disable-maintainer-mode \
     --host=${TARGET_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1

build/android-libaom.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-
-if [[ -z ${ANDROID_NDK_ROOT} ]]; then
-    echo -e "(*) ANDROID_NDK_ROOT not defined\n"
-    exit 1
-fi
-
-if [[ -z ${ARCH} ]]; then
-    echo -e "(*) ARCH not defined\n"
-    exit 1
-fi
-
-if [[ -z ${API} ]]; then
-    echo -e "(*) API not defined\n"
-    exit 1
-fi
-
-if [[ -z ${BASEDIR} ]]; then
-    echo -e "(*) BASEDIR not defined\n"
-    exit 1
-fi
-
-# ENABLE COMMON FUNCTIONS
-. ${BASEDIR}/build/android-common.sh
-
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
-LIB_NAME="libaom"
-set_toolchain_clang_paths ${LIB_NAME}
-
-# PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
-CFLAGS=$(get_cflags ${LIB_NAME})
-CXXFLAGS=$(get_cxxflags ${LIB_NAME})
-LDFLAGS=$(get_ldflags ${LIB_NAME})
-
-ARCH_OPTIONS=""
-case ${ARCH} in
-    arm-v7a)
-        ARCH_OPTIONS="-DARCH_ARM=1 -DENABLE_NEON=0 -DHAVE_NEON=0"
-    ;;
-    arm-v7a-neon)
-        ARCH_OPTIONS="-DARCH_ARM=1 -DENABLE_NEON=1 -DHAVE_NEON=1"
-    ;;
-    arm64-v8a)
-        ARCH_OPTIONS="-DARCH_ARM=1 -DENABLE_NEON=1 -DHAVE_NEON=1"
-    ;;
-    x86)
-        ARCH_OPTIONS="-DENABLE_SSE=1 -DHAVE_SSE=1 -DENABLE_SSE3=1 -DHAVE_SSE3=1"
-    ;;
-    x86-64)
-        ARCH_OPTIONS="-DENABLE_SSE4_2=1 -DHAVE_SSE4_2=1"
-    ;;
-esac
-
-cd ${BASEDIR}/src/${LIB_NAME} || exit 1
-
-if [ -d "cmake-build" ]; then
-    rm -rf cmake-build
-fi
-
-mkdir cmake-build;
-cd cmake-build
-
-cmake -Wno-dev \
-    -DCMAKE_VERBOSE_MAKEFILE=0 \
-    -DCONFIG_PIC=1 \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-    -DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
-    -DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SYSTEM_NAME=Generic \
-    -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
-    -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
-    -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
-    -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
-    -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
-    -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
-    ${ARCH_OPTIONS} \
-    -DENABLE_TESTS=0 \
-    -DENABLE_EXAMPLES=0 \
-    -DENABLE_TOOLS=0 \
-    -DCONFIG_UNIT_TESTS=0 \
-    -DAOM_TARGET_CPU=generic \
-    -DBUILD_SHARED_LIBS=0 .. || exit 1
-
-make -j$(get_cpu_count) || exit 1
-
-# CREATE PACKAGE CONFIG MANUALLY
-create_libaom_package_config "0.1.0"
-
-make install || exit 1

build/android-libpng.sh

@@ -36,16 +36,16 @@ export LDFLAGS=$(get_ldflags ${LIB_NAME})
 CPU_SPECIFIC_OPTIONS=""
 case ${ARCH} in
     x86 | x86-64)
-        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-intel-sse=yes"
+        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-intel-sse"
     ;;
     arm-v7a-neon | arm64-v8a)
-        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-arm-neon=yes"
+        CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations --enable-arm-neon"
     ;;
     arm-v7a)
         # hardware-optimizations not enabled because
         # when --enable-hardware-optimizations is added
         # make tries to build arm-neon specific instructions, which breaks compilation
-        CPU_SPECIFIC_OPTIONS="--enable-arm-neon=no"
+        CPU_SPECIFIC_OPTIONS="--disable-arm-neon"
     ;;
 esac
 

build/android-libvorbis.sh

@@ -59,6 +59,6 @@ fi
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libvorbis_package_config "1.3.6"
+create_libvorbis_package_config "1.3.5"
 
 make install || exit 1

build/android-libwebp.sh

@@ -66,12 +66,12 @@ cmake -Wno-dev \
     -DTIFF_LIBRARY="${BASEDIR}/prebuilt/android-$(get_target_build)/tiff/lib" \
     -DZLIB_INCLUDE_DIR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot/usr/include" \
     -DZLIB_LIBRARY="${ANDROID_NDK_ROOT}/platform/android-${API}/arch-$(get_target_build)/usr/lib" \
-    -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
+    -DCMAKE_SYSTEM_PROCESSOR=$(get_target_build) \
     -DBUILD_SHARED_LIBS=0 .. || exit 1
 
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libwebp_package_config "1.0.0"
+create_libwebp_package_config "0.6.1"
 
 make install || exit 1

build/android-libxml2.sh

@@ -44,8 +44,10 @@ make distclean 2>/dev/null 1>/dev/null
 # #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)."
 #
 
-# ALWAYS RECONFIGURED
-autoreconf_library ${LIB_NAME}
+# RECONFIGURING IF REQUESTED
+if [[ ${RECONF_libxml2} -eq 1 ]]; then
+    autoreconf_library ${LIB_NAME}
+fi
 
 ./configure \
     --prefix=${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME} \
@@ -65,6 +67,6 @@ autoreconf_library ${LIB_NAME}
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libxml2_package_config "2.9.8"
+create_libxml2_package_config "2.9.7"
 
 make install || exit 1

build/android-snappy.sh

@@ -60,7 +60,7 @@ cmake -Wno-dev \
     -DSNAPPY_BUILD_TESTS=0 \
     -DHAVE_LIBLZO2=0 \
     -DHAVE_LIBZ=1 \
-    -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
+    -DCMAKE_SYSTEM_PROCESSOR=$(get_target_build) \
     -DBUILD_SHARED_LIBS=0 .. || exit 1
 
 make -j$(get_cpu_count) || exit 1

build/android-soxr.sh

@@ -1,73 +0,0 @@
-#!/bin/bash
-
-if [[ -z ${ANDROID_NDK_ROOT} ]]; then
-    echo -e "(*) ANDROID_NDK_ROOT not defined\n"
-    exit 1
-fi
-
-if [[ -z ${ARCH} ]]; then
-    echo -e "(*) ARCH not defined\n"
-    exit 1
-fi
-
-if [[ -z ${API} ]]; then
-    echo -e "(*) API not defined\n"
-    exit 1
-fi
-
-if [[ -z ${BASEDIR} ]]; then
-    echo -e "(*) BASEDIR not defined\n"
-    exit 1
-fi
-
-# ENABLE COMMON FUNCTIONS
-. ${BASEDIR}/build/android-common.sh
-
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
-LIB_NAME="soxr"
-set_toolchain_clang_paths ${LIB_NAME}
-
-# PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
-CFLAGS=$(get_cflags ${LIB_NAME})
-CXXFLAGS=$(get_cxxflags ${LIB_NAME})
-LDFLAGS=$(get_ldflags ${LIB_NAME})
-
-cd ${BASEDIR}/src/${LIB_NAME} || exit 1
-
-if [ -d "build" ]; then
-    rm -rf build
-fi
-
-mkdir build;
-cd build
-
-cmake -Wno-dev \
-    -DCMAKE_VERBOSE_MAKEFILE=0 \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-    -DCMAKE_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
-    -DCMAKE_FIND_ROOT_PATH="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/sysroot" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/android-$(get_target_build)/${LIB_NAME}" \
-    -DCMAKE_SYSTEM_NAME=Generic \
-    -DCMAKE_CXX_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CXX" \
-    -DCMAKE_C_COMPILER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$CC" \
-    -DCMAKE_LINKER="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$LD" \
-    -DCMAKE_AR="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AR" \
-    -DCMAKE_AS="${ANDROID_NDK_ROOT}/toolchains/mobile-ffmpeg-${TOOLCHAIN}/bin/$AS" \
-    -DBUILD_TESTS=0 \
-    -DWITH_DEV_TRACE=0 \
-    -DWITH_LSR_BINDINGS=0 \
-    -DWITH_OPENMP=0 \
-    -DWITH_PFFFT=1 \
-    -DCMAKE_SYSTEM_PROCESSOR=$(get_cmake_target_processor) \
-    -DBUILD_SHARED_LIBS=0 .. || exit 1
-
-make -j$(get_cpu_count) || exit 1
-
-# CREATE PACKAGE CONFIG MANUALLY
-create_soxr_package_config "0.1.3"
-
-make install || exit 1

build/ios-common.sh

@@ -33,20 +33,18 @@ get_library_name() {
         20) echo "libilbc" ;;
         21) echo "opus" ;;
         22) echo "snappy" ;;
-        23) echo "soxr" ;;
-        24) echo "libaom" ;;
-        25) echo "giflib" ;;
-        26) echo "jpeg" ;;
-        27) echo "libogg" ;;
-        28) echo "libpng" ;;
-        29) echo "libuuid" ;;
-        30) echo "nettle" ;;
-        31) echo "tiff" ;;
-        32) echo "expat" ;;
-        33) echo "ios-zlib" ;;
-        34) echo "ios-audiotoolbox" ;;
-        35) echo "ios-coreimage" ;;
-        36) echo "ios-bzip2" ;;
+        23) echo "giflib" ;;
+        24) echo "jpeg" ;;
+        25) echo "libogg" ;;
+        26) echo "libpng" ;;
+        27) echo "libuuid" ;;
+        28) echo "nettle" ;;
+        29) echo "tiff" ;;
+        30) echo "expat" ;;
+        31) echo "ios-zlib" ;;
+        32) echo "ios-audiotoolbox" ;;
+        33) echo "ios-coreimage" ;;
+        34) echo "ios-bzip2" ;;
     esac
 }
 
@@ -98,18 +96,12 @@ get_sdk_path() {
 }
 
 get_min_version_cflags() {
-    local min_version=${IOS_MIN_VERSION}
-
-    if [ "$1" == "gnutls" ]; then
-        min_version=${GNUTLS_IOS_MIN_VERSION}
-    fi
-
     case ${ARCH} in
         armv7 | armv7s | arm64)
-            echo "-miphoneos-version-min=${min_version}"
+            echo "-miphoneos-version-min=${IOS_MIN_VERSION}"
         ;;
         i386 | x86-64)
-            echo "-mios-simulator-version-min=${min_version}"
+            echo "-mios-simulator-version-min=${IOS_MIN_VERSION}"
         ;;
     esac
 }
@@ -138,7 +130,7 @@ get_arch_specific_cflags() {
             echo "-arch armv7s -target $(get_target_host) -march=armv7s -mcpu=generic -mfpu=neon -mfloat-abi=softfp"
         ;;
         arm64)
-            echo "-arch arm64 -target $(get_target_host) -march=armv8-a+crc+crypto -mcpu=generic"
+            echo "-arch arm64 -target $(get_target_host) -march=armv8a -mcpu=generic"
         ;;
         i386)
             echo "-arch i386 -target $(get_target_host) -march=i386 -mtune=intel -mssse3 -mfpmath=sse -m32"
@@ -183,9 +175,6 @@ get_app_specific_cflags() {
         ffmpeg | shine)
             APP_FLAGS="-Wno-unused-function"
         ;;
-        soxr | snappy)
-            APP_FLAGS="-std=gnu99 -Wno-unused-function -DPIC"
-        ;;
         kvazaar)
             APP_FLAGS="-std=gnu99 -Wno-unused-function"
         ;;
@@ -205,7 +194,7 @@ get_cflags() {
     APP_FLAGS=$(get_app_specific_cflags $1)
     COMMON_FLAGS=$(get_common_cflags)
     OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
-    MIN_VERSION_FLAGS=$(get_min_version_cflags $1)
+    MIN_VERSION_FLAGS=$(get_min_version_cflags)
     COMMON_INCLUDES=$(get_common_includes)
 
     echo "${ARCH_FLAGS} ${APP_FLAGS} ${COMMON_FLAGS} ${OPTIMIZATION_FLAGS} ${MIN_VERSION_FLAGS} ${COMMON_INCLUDES}"
@@ -216,14 +205,14 @@ get_asmflags() {
     APP_FLAGS=$(get_app_specific_cflags $1)
     COMMON_FLAGS=$(get_common_cflags)
     OPTIMIZATION_FLAGS=$(get_size_optimization_cflags $1)
-    MIN_VERSION_FLAGS=$(get_min_version_cflags $1)
+    MIN_VERSION_FLAGS=$(get_min_version_cflags)
     COMMON_INCLUDES=$(get_common_includes)
 
     echo "${ARCH_FLAGS} ${APP_FLAGS} ${COMMON_FLAGS} ${OPTIMIZATION_FLAGS} ${MIN_VERSION_FLAGS} ${COMMON_INCLUDES}"
 }
 
 get_cxxflags() {
-    local COMMON_CFLAGS="$(get_common_cflags $1) $(get_common_includes $1) $(get_arch_specific_cflags $1) $(get_min_version_cflags $1)"
+    local COMMON_CFLAGS="$(get_common_cflags $1) $(get_common_includes $1) $(get_arch_specific_cflags $1) $(get_min_version_cflags)"
 
     case $1 in
         gnutls)
@@ -235,9 +224,6 @@ get_cxxflags() {
         libwebp | xvidcore)
             echo "-std=c++11 -fno-exceptions -fno-rtti -fembed-bitcode -fno-common -DPIC ${COMMON_CFLAGS}"
         ;;
-        libaom)
-            echo "-std=c++11 -fno-exceptions -fembed-bitcode ${COMMON_CFLAGS}"
-        ;;
         *)
             echo "-std=c++11 -fno-exceptions -fno-rtti -fembed-bitcode ${COMMON_CFLAGS}"
         ;;
@@ -261,7 +247,7 @@ get_arch_specific_ldflags() {
             echo "-arch armv7s -march=armv7s -mfpu=neon -mfloat-abi=softfp -fembed-bitcode"
         ;;
         arm64)
-            echo "-arch arm64 -march=armv8-a+crc+crypto -fembed-bitcode"
+            echo "-arch arm64 -march=armv8a -fembed-bitcode"
         ;;
         i386)
             echo "-arch i386 -march=i386"
@@ -530,6 +516,24 @@ Cflags: -I\${includedir} -I\${includedir}/libxml2
 EOF
 }
 
+create_uuid_package_config() {
+    local UUID_VERSION="$1"
+
+    cat > "${INSTALL_PKG_CONFIG_DIR}/uuid.pc" << EOF
+prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/libuuid
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: uuid
+Description: Universally unique id library
+Version: ${UUID_VERSION}
+Requires:
+Cflags: -I\${includedir}
+Libs: -L\${libdir} -luuid
+EOF
+}
+
 create_snappy_package_config() {
     local SNAPPY_VERSION="$1"
 
@@ -549,43 +553,6 @@ Cflags: -I\${includedir}
 EOF
 }
 
-create_soxr_package_config() {
-    local SOXR_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/soxr.pc" << EOF
-prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/soxr
-exec_prefix=\${prefix}
-libdir=\${prefix}/lib
-includedir=\${prefix}/include
-
-Name: soxr
-Description: High quality, one-dimensional sample-rate conversion library
-Version: ${SOXR_VERSION}
-
-Requires:
-Libs: -L\${libdir} -lsoxr
-Cflags: -I\${includedir}
-EOF
-}
-
-create_uuid_package_config() {
-    local UUID_VERSION="$1"
-
-    cat > "${INSTALL_PKG_CONFIG_DIR}/uuid.pc" << EOF
-prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/libuuid
-exec_prefix=\${prefix}
-libdir=\${exec_prefix}/lib
-includedir=\${prefix}/include
-
-Name: uuid
-Description: Universally unique id library
-Version: ${UUID_VERSION}
-Requires:
-Cflags: -I\${includedir}
-Libs: -L\${libdir} -luuid
-EOF
-}
-
 create_xvidcore_package_config() {
     local XVIDCORE_VERSION="$1"
 
@@ -683,9 +650,9 @@ download_gpl_library_source() {
 
     case $1 in
         x264)
-            GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180627-2245-stable.tar.bz2"
-            GPL_LIB_FILE="x264-snapshot-20180627-2245-stable.tar.bz2"
-            GPL_LIB_ORIG_DIR="x264-snapshot-20180627-2245-stable"
+            GPL_LIB_URL="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180815-2245-stable.tar.bz2"
+            GPL_LIB_FILE="x264-snapshot-20180815-2245-stable.tar.bz2"
+            GPL_LIB_ORIG_DIR="x264-snapshot-20180815-2245-stable"
             GPL_LIB_DEST_DIR="x264"
         ;;
         xvidcore)

build/ios-ffmpeg.sh

@@ -76,7 +76,7 @@ esac
 
 CONFIGURE_POSTFIX=""
 
-for library in {1..37}
+for library in {1..35}
 do
     if [[ ${!library} -eq 1 ]]; then
         ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -119,11 +119,6 @@ do
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static libmp3lame)"
                 CONFIGURE_POSTFIX+=" --enable-libmp3lame"
             ;;
-            libaom)
-                FFMPEG_CFLAGS+=" $(pkg-config --cflags aom)"
-                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static aom)"
-                CONFIGURE_POSTFIX+=" --enable-libaom"
-            ;;
             libass)
                 FFMPEG_CFLAGS+=" $(pkg-config --cflags libass)"
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static libass)"
@@ -151,7 +146,7 @@ do
             ;;
             libvpx)
                 FFMPEG_CFLAGS+=" $(pkg-config --cflags vpx)"
-                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static vpx)"
+                FFMPEG_LDFLAGS+=" $(pkg-config --libs vpx)"
                 CONFIGURE_POSTFIX+=" --enable-libvpx"
             ;;
             libwebp)
@@ -187,11 +182,6 @@ do
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static snappy)"
                 CONFIGURE_POSTFIX+=" --enable-libsnappy"
             ;;
-            soxr)
-                FFMPEG_CFLAGS+=" $(pkg-config --cflags soxr)"
-                FFMPEG_LDFLAGS+=" $(pkg-config --libs --static soxr)"
-                CONFIGURE_POSTFIX+=" --enable-libsoxr"
-            ;;
             speex)
                 FFMPEG_CFLAGS+=" $(pkg-config --cflags speex)"
                 FFMPEG_LDFLAGS+=" $(pkg-config --libs --static speex)"
@@ -262,13 +252,13 @@ do
         # THE FOLLOWING LIBRARIES SHOULD BE EXPLICITLY DISABLED TO PREVENT AUTODETECT
         if [[ ${library} -eq 8 ]]; then
             CONFIGURE_POSTFIX+=" --disable-iconv"
-        elif [[ ${library} -eq 34 ]]; then
+        elif [[ ${library} -eq 32 ]]; then
             CONFIGURE_POSTFIX+=" --disable-zlib"
-        elif [[ ${library} -eq 35 ]]; then
+        elif [[ ${library} -eq 33 ]]; then
             CONFIGURE_POSTFIX+=" --disable-audiotoolbox"
-        elif [[ ${library} -eq 36 ]]; then
+        elif [[ ${library} -eq 34 ]]; then
             CONFIGURE_POSTFIX+=" --disable-coreimage"
-        elif [[ ${library} -eq 37 ]]; then
+        elif [[ ${library} -eq 35 ]]; then
             CONFIGURE_POSTFIX+=" --disable-bzlib"
         fi
     fi
@@ -323,7 +313,6 @@ make distclean 2>/dev/null 1>/dev/null
     --enable-small  \
     --enable-swscale \
     --enable-shared \
-    --disable-openssl \
     --disable-xmm-clobber-test \
     --disable-debug \
     --disable-neon-clobber-test \
@@ -335,6 +324,7 @@ make distclean 2>/dev/null 1>/dev/null
     --disable-podpages \
     --disable-txtpages \
     --disable-static \
+    --disable-jack \
     --disable-sndio \
     --disable-schannel \
     --disable-sdl2 \
@@ -344,6 +334,7 @@ make distclean 2>/dev/null 1>/dev/null
     --disable-cuvid \
     --disable-nvenc \
     --disable-vaapi \
+    --disable-vda \
     --disable-vdpau \
     --disable-videotoolbox \
     --disable-appkit \
@@ -352,6 +343,7 @@ make distclean 2>/dev/null 1>/dev/null
     --disable-cuvid \
     --disable-nvenc \
     --disable-vaapi \
+    --disable-vda \
     --disable-vdpau \
     --disable-videotoolbox \
     ${CONFIGURE_POSTFIX} 1>>${BASEDIR}/build.log 2>>${BASEDIR}/build.log

build/ios-fontconfig.sh

@@ -65,6 +65,6 @@ fi
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_fontconfig_package_config "2.13.0"
+create_fontconfig_package_config "2.12.93"
 
 make install || exit 1

build/ios-freetype.sh

@@ -68,6 +68,6 @@ export LIBPNG_LIBS="-L${BASEDIR}/prebuilt/ios-$(get_target_host)/libpng/lib"
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_freetype_package_config "22.0.16"
+create_freetype_package_config "22.1.16"
 
 make install || exit 1

build/ios-fribidi.sh

@@ -52,6 +52,7 @@ fi
     --prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
     --with-pic \
     --with-sysroot=${SDK_PATH} \
+    --without-glib \
     --enable-static \
     --disable-shared \
     --disable-fast-install \

build/ios-gmp.sh

@@ -32,6 +32,15 @@ fi
 LIB_NAME="gmp"
 set_toolchain_clang_paths ${LIB_NAME}
 
+# PREPARING FLAGS
+case ${ARCH} in
+    i386)
+        TARGET_HOST="x86-apple-darwin"
+    ;;
+    *)
+        TARGET_HOST=$(get_target_host)
+    ;;
+esac
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
@@ -45,32 +54,13 @@ if [[ ${RECONF_gmp} -eq 1 ]]; then
     autoreconf_library ${LIB_NAME}
 fi
 
-# PREPARING FLAGS
-ASM_FLAGS=""
-case ${ARCH} in
-    armv7 | armv7s | arm64)
-        ASM_FLAGS="--disable-assembly"
-    ;;
-    i386 | x86-64)
-        ASM_FLAGS="--enable-assembly"
-    ;;
-esac
-case ${ARCH} in
-    i386)
-        TARGET_HOST="x86-apple-darwin"
-    ;;
-    *)
-        TARGET_HOST=$(get_target_host)
-    ;;
-esac
-
 ./configure \
     --prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
     --with-pic \
     --with-sysroot=${SDK_PATH} \
     --enable-static \
     --disable-shared \
-    ${ASM_FLAGS} \
+    --disable-assembly \
     --disable-fast-install \
     --disable-maintainer-mode \
     --host=${TARGET_HOST} || exit 1

build/ios-gnutls.sh

@@ -98,6 +98,6 @@ fi
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_gnutls_package_config "3.5.18"
+create_gnutls_package_config "3.5.19"
 
 make install || exit 1

build/ios-jpeg.sh

@@ -31,7 +31,6 @@ fi
 # PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
 LIB_NAME="jpeg"
 set_toolchain_clang_paths ${LIB_NAME}
-export CCAS=${AS}
 
 # PREPARING FLAGS
 TARGET_HOST=$(get_target_host)
@@ -55,11 +54,7 @@ fi
     --enable-static \
     --disable-shared \
     --disable-fast-install \
-    --with-jpeg8 \
-    --with-gas-preprocessor \
-    --with-simd \
-    --without-turbojpeg \
-    --without-java \
+    --disable-maintainer-mode \
     --host=${TARGET_HOST} || exit 1
 
 make -j$(get_cpu_count) || exit 1

build/ios-libaom.sh

@@ -1,103 +0,0 @@
-#!/bin/bash
-
-if [[ -z ${ARCH} ]]; then
-    echo -e "(*) ARCH not defined\n"
-    exit 1
-fi
-
-if [[ -z ${IOS_MIN_VERSION} ]]; then
-    echo -e "(*) IOS_MIN_VERSION not defined\n"
-    exit 1
-fi
-
-if [[ -z ${TARGET_SDK} ]]; then
-    echo -e "(*) TARGET_SDK not defined\n"
-    exit 1
-fi
-
-if [[ -z ${SDK_PATH} ]]; then
-    echo -e "(*) SDK_PATH not defined\n"
-    exit 1
-fi
-
-if [[ -z ${BASEDIR} ]]; then
-    echo -e "(*) BASEDIR not defined\n"
-    exit 1
-fi
-
-# ENABLE COMMON FUNCTIONS
-. ${BASEDIR}/build/ios-common.sh
-
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
-LIB_NAME="libaom"
-set_toolchain_clang_paths ${LIB_NAME}
-
-# PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
-CFLAGS="$(get_cflags ${LIB_NAME})"
-CXXFLAGS="$(get_cxxflags ${LIB_NAME})"
-LDFLAGS="$(get_ldflags ${LIB_NAME})"
-
-TOOLCHAIN_FILE=""
-ARCH_OPTIONS=""
-case ${ARCH} in
-    armv7)
-        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/armv7-ios.cmake"
-        ARCH_OPTIONS="-DARCH_ARM=1 -DENABLE_NEON=1 -DHAVE_NEON=1"
-    ;;
-    armv7s)
-        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/armv7s-ios.cmake"
-        ARCH_OPTIONS="-DARCH_ARM=1 -DENABLE_NEON=1 -DHAVE_NEON=1"
-    ;;
-    arm64)
-        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/arm64-ios.cmake"
-        ARCH_OPTIONS="-DARCH_ARM=1 -DENABLE_NEON=1 -DHAVE_NEON=1"
-    ;;
-    i386)
-        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/x86-ios-simulator.cmake"
-        ARCH_OPTIONS="-DARCH_X86=1 -DENABLE_SSE=1 -DHAVE_SSE=1 -DENABLE_SSE3=1 -DHAVE_SSE3=1"
-    ;;
-    x86-64)
-        TOOLCHAIN_FILE="${BASEDIR}/src/${LIB_NAME}/build/cmake/toolchains/x86_64-ios-simulator.cmake"
-        ARCH_OPTIONS="-DARCH_X86_64=1 -DENABLE_SSE4_2=1 -DHAVE_SSE4_2=1"
-    ;;
-esac
-
-cd ${BASEDIR}/src/${LIB_NAME} || exit 1
-
-if [ -d "cmake-build" ]; then
-    rm -rf cmake-build
-fi
-
-mkdir cmake-build;
-cd cmake-build
-
-cmake -Wno-dev \
-    -DCMAKE_VERBOSE_MAKEFILE=0 \
-    -DCONFIG_PIC=1 \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-    -DCMAKE_SYSROOT="${SDK_PATH}" \
-    -DCMAKE_FIND_ROOT_PATH="${SDK_PATH}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME}" \
-    -DCMAKE_CXX_COMPILER="$CXX" \
-    -DCMAKE_C_COMPILER="$CC" \
-    -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
-    -DCMAKE_AS="$AS" \
-    -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} \
-    ${ARCH_OPTIONS} \
-    -DENABLE_TESTS=0 \
-    -DENABLE_EXAMPLES=0 \
-    -DENABLE_TOOLS=0 \
-    -DCONFIG_UNIT_TESTS=0 \
-    -DBUILD_SHARED_LIBS=0 .. || exit 1
-
-make -j$(get_cpu_count) || exit 1
-
-# MANUALLY COPY PKG-CONFIG FILES
-cp ${BASEDIR}/src/${LIB_NAME}/cmake-build/aom.pc ${INSTALL_PKG_CONFIG_DIR}
-
-make install || exit 1

build/ios-libpng.sh

@@ -38,13 +38,13 @@ export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
 
-CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations=yes"
+CPU_SPECIFIC_OPTIONS="--enable-hardware-optimizations"
 case ${ARCH} in
     x86 | x86-64)
-        CPU_SPECIFIC_OPTIONS+=" --enable-sse=yes"
+        CPU_SPECIFIC_OPTIONS+=" --enable-sse"
     ;;
     armv7 | armv7s | arm64)
-        CPU_SPECIFIC_OPTIONS+=" --enable-arm-neon=yes"
+        CPU_SPECIFIC_OPTIONS+=" --enable-arm-neon"
     ;;
 esac
 

build/ios-libvorbis.sh

@@ -37,7 +37,6 @@ TARGET_HOST=$(get_target_host)
 export CFLAGS=$(get_cflags ${LIB_NAME})
 export CXXFLAGS=$(get_cxxflags ${LIB_NAME})
 export LDFLAGS=$(get_ldflags ${LIB_NAME})
-export PKG_CONFIG_LIBDIR="${INSTALL_PKG_CONFIG_DIR}"
 
 cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
@@ -52,6 +51,8 @@ fi
     --prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
     --with-pic \
     --with-sysroot=${SDK_PATH} \
+    --with-ogg-includes=${BASEDIR}/prebuilt/ios-$(get_target_host)/libogg/include \
+    --with-ogg-libraries=${BASEDIR}/prebuilt/ios-$(get_target_host)/libogg/lib \
     --enable-static \
     --disable-shared \
     --disable-fast-install \
@@ -63,6 +64,6 @@ fi
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libvorbis_package_config "1.3.6"
+create_libvorbis_package_config "1.3.5"
 
 make install || exit 1

build/ios-libwebp.sh

@@ -56,7 +56,7 @@ cmake -Wno-dev \
     -DCMAKE_FIND_ROOT_PATH="${SDK_PATH}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME}" \
-    -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_SYSTEM_NAME=Generic \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \
     -DCMAKE_AR="$AR" \
@@ -77,6 +77,6 @@ cmake -Wno-dev \
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libwebp_package_config "1.0.0"
+create_libwebp_package_config "0.6.1"
 
 make install || exit 1

build/ios-libxml2.sh

@@ -43,8 +43,10 @@ cd ${BASEDIR}/src/${LIB_NAME} || exit 1
 
 make distclean 2>/dev/null 1>/dev/null
 
-# ALWAYS RECONFIGURED
-autoreconf_library ${LIB_NAME}
+# RECONFIGURING IF REQUESTED
+if [[ ${RECONF_libxml2} -eq 1 ]]; then
+    autoreconf_library ${LIB_NAME}
+fi
 
 ./configure \
     --prefix=${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME} \
@@ -64,6 +66,6 @@ autoreconf_library ${LIB_NAME}
 make -j$(get_cpu_count) || exit 1
 
 # CREATE PACKAGE CONFIG MANUALLY
-create_libxml2_package_config "2.9.8"
+create_libxml2_package_config "2.9.7"
 
 make install || exit 1

build/ios-snappy.sh

@@ -56,7 +56,7 @@ cmake -Wno-dev \
     -DCMAKE_FIND_ROOT_PATH="${SDK_PATH}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME}" \
-    -DCMAKE_SYSTEM_NAME=Darwin \
+    -DCMAKE_SYSTEM_NAME=Generic \
     -DCMAKE_CXX_COMPILER="$CXX" \
     -DCMAKE_C_COMPILER="$CC" \
     -DCMAKE_LINKER="$LD" \

build/ios-soxr.sh

@@ -1,76 +0,0 @@
-#!/bin/bash
-
-if [[ -z ${ARCH} ]]; then
-    echo -e "(*) ARCH not defined\n"
-    exit 1
-fi
-
-if [[ -z ${IOS_MIN_VERSION} ]]; then
-    echo -e "(*) IOS_MIN_VERSION not defined\n"
-    exit 1
-fi
-
-if [[ -z ${TARGET_SDK} ]]; then
-    echo -e "(*) TARGET_SDK not defined\n"
-    exit 1
-fi
-
-if [[ -z ${SDK_PATH} ]]; then
-    echo -e "(*) SDK_PATH not defined\n"
-    exit 1
-fi
-
-if [[ -z ${BASEDIR} ]]; then
-    echo -e "(*) BASEDIR not defined\n"
-    exit 1
-fi
-
-# ENABLE COMMON FUNCTIONS
-. ${BASEDIR}/build/ios-common.sh
-
-# PREPARING PATHS & DEFINING ${INSTALL_PKG_CONFIG_DIR}
-LIB_NAME="soxr"
-set_toolchain_clang_paths ${LIB_NAME}
-
-# PREPARING FLAGS
-TARGET_HOST=$(get_target_host)
-CFLAGS=$(get_cflags ${LIB_NAME})
-CXXFLAGS=$(get_cxxflags ${LIB_NAME})
-LDFLAGS=$(get_ldflags ${LIB_NAME})
-
-cd ${BASEDIR}/src/${LIB_NAME} || exit 1
-
-if [ -d "build" ]; then
-    rm -rf build
-fi
-
-mkdir build;
-cd build
-
-cmake -Wno-dev \
-    -DCMAKE_VERBOSE_MAKEFILE=0 \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-    -DCMAKE_SYSROOT="${SDK_PATH}" \
-    -DCMAKE_FIND_ROOT_PATH="${SDK_PATH}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="${BASEDIR}/prebuilt/ios-$(get_target_host)/${LIB_NAME}" \
-    -DCMAKE_SYSTEM_NAME=Generic \
-    -DCMAKE_C_COMPILER="$CC" \
-    -DCMAKE_LINKER="$LD" \
-    -DCMAKE_AR="$AR" \
-    -DCMAKE_AS="$AS" \
-    -DBUILD_TESTS=0 \
-    -DWITH_DEV_TRACE=0 \
-    -DWITH_LSR_BINDINGS=0 \
-    -DWITH_OPENMP=0 \
-    -DCMAKE_SYSTEM_PROCESSOR=$(get_target_arch) \
-    -DBUILD_SHARED_LIBS=0 .. || exit 1
-
-make -j$(get_cpu_count) || exit 1
-
-# CREATE PACKAGE CONFIG MANUALLY
-create_soxr_package_config "0.1.3"
-
-make install || exit 1

build/main-android.sh

@@ -20,70 +20,6 @@ if [[ -z ${BASEDIR} ]]; then
     exit 1
 fi
 
-check_if_dependency_rebuilt() {
-    case $1 in
-        expat)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        fontconfig)
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        freetype)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        fribidi)
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        giflib)
-            set_dependency_rebuilt_flag "libwebp"
-        ;;
-        gmp)
-            set_dependency_rebuilt_flag "gnutls"
-            set_dependency_rebuilt_flag "nettle"
-        ;;
-        jpeg)
-            set_dependency_rebuilt_flag "tiff"
-            set_dependency_rebuilt_flag "libwebp"
-        ;;
-        libiconv)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "gnutls"
-            set_dependency_rebuilt_flag "lame"
-            set_dependency_rebuilt_flag "libass"
-            set_dependency_rebuilt_flag "libxml2"
-        ;;
-        libogg)
-            set_dependency_rebuilt_flag "libvorbis"
-            set_dependency_rebuilt_flag "libtheora"
-        ;;
-        libpng)
-            set_dependency_rebuilt_flag "freetype"
-            set_dependency_rebuilt_flag "libwebp"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        libuuid)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        libvorbis)
-            set_dependency_rebuilt_flag "libtheora"
-        ;;
-        nettle)
-            set_dependency_rebuilt_flag "gnutls"
-        ;;
-        tiff)
-            set_dependency_rebuilt_flag "libwebp"
-        ;;
-    esac
-}
-
-set_dependency_rebuilt_flag() {
-    DEPENDENCY_REBUILT_VARIABLE=$(echo "DEPENDENCY_REBUILT_$1" | sed "s/\-/\_/g")
-    export ${DEPENDENCY_REBUILT_VARIABLE}=1
-}
-
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/android-common.sh
 
@@ -100,7 +36,7 @@ fi
 # FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
 # NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
 enabled_library_list=()
-for library in {1..33}
+for library in {1..31}
 do
     if [[ ${!library} -eq 1 ]]; then
         ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -140,7 +76,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                 fi
             ;;
             libass)
-                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_libiconv ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
+                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_libiconv ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]]; then
                     run=1
                 fi
             ;;
@@ -164,16 +100,6 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                     run=1
                 fi
             ;;
-            nettle)
-                if [[ ! -z $OK_gmp ]]; then
-                    run=1
-                fi
-            ;;
-            tiff)
-                if [[ ! -z $OK_jpeg ]]; then
-                    run=1
-                fi
-            ;;
             *)
                 run=1
             ;;
@@ -181,17 +107,16 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
 
         BUILD_COMPLETED_FLAG=$(echo "OK_${library}" | sed "s/\-/\_/g")
         REBUILD_FLAG=$(echo "REBUILD_${library}" | sed "s/\-/\_/g")
-        DEPENDENCY_REBUILT_FLAG=$(echo "DEPENDENCY_REBUILT_${library}" | sed "s/\-/\_/g")
 
         if [ $run -eq 1 ] && [[ -z ${!BUILD_COMPLETED_FLAG} ]]; then
             ENABLED_LIBRARY_PATH="${INSTALL_BASE}/${library}"
 
             LIBRARY_IS_INSTALLED=$(library_is_installed ${INSTALL_BASE} ${library})
 
-            echo -e "INFO: Flags detected for ${library}: already installed=${LIBRARY_IS_INSTALLED}, rebuild=${!REBUILD_FLAG}, dependency rebuilt=${!DEPENDENCY_REBUILT_FLAG}\n" >> ${BASEDIR}/build.log
+            echo -e "INFO: Flags detected for ${library}: already installed=${LIBRARY_IS_INSTALLED}, rebuild=${!REBUILD_FLAG}\n" >> ${BASEDIR}/build.log
 
             # DECIDE TO BUILD OR NOT
-            if [[ ${LIBRARY_IS_INSTALLED} -ne 0 ]] || [[ ${!REBUILD_FLAG} -eq 1 ]] || [[ ${!DEPENDENCY_REBUILT_FLAG} -eq 1 ]]; then
+            if [[ ${LIBRARY_IS_INSTALLED} -ne 0 ]] || [[ ${!REBUILD_FLAG} -eq 1 ]]; then
 
                 echo -e "----------------------------------------------------------------" >> ${BASEDIR}/build.log
                 echo -e "\nINFO: Building $library with the following environment variables\n" >> ${BASEDIR}/build.log
@@ -217,7 +142,6 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                 if [ $? -eq 0 ]; then
                     (( completed+=1 ))
                     declare "$BUILD_COMPLETED_FLAG=1"
-                    check_if_dependency_rebuilt ${library}
                     echo "ok"
                 else
                     echo "failed"

build/main-ios.sh

@@ -25,70 +25,6 @@ if [[ -z ${BASEDIR} ]]; then
     exit 1
 fi
 
-check_if_dependency_rebuilt() {
-    case $1 in
-        expat)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        fontconfig)
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        freetype)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        fribidi)
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        giflib)
-            set_dependency_rebuilt_flag "libwebp"
-        ;;
-        gmp)
-            set_dependency_rebuilt_flag "gnutls"
-            set_dependency_rebuilt_flag "nettle"
-        ;;
-        jpeg)
-            set_dependency_rebuilt_flag "tiff"
-            set_dependency_rebuilt_flag "libwebp"
-        ;;
-        libiconv)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "gnutls"
-            set_dependency_rebuilt_flag "lame"
-            set_dependency_rebuilt_flag "libass"
-            set_dependency_rebuilt_flag "libxml2"
-        ;;
-        libogg)
-            set_dependency_rebuilt_flag "libvorbis"
-            set_dependency_rebuilt_flag "libtheora"
-        ;;
-        libpng)
-            set_dependency_rebuilt_flag "freetype"
-            set_dependency_rebuilt_flag "libwebp"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        libuuid)
-            set_dependency_rebuilt_flag "fontconfig"
-            set_dependency_rebuilt_flag "libass"
-        ;;
-        libvorbis)
-            set_dependency_rebuilt_flag "libtheora"
-        ;;
-        nettle)
-            set_dependency_rebuilt_flag "gnutls"
-        ;;
-        tiff)
-            set_dependency_rebuilt_flag "libwebp"
-        ;;
-    esac
-}
-
-set_dependency_rebuilt_flag() {
-    DEPENDENCY_REBUILT_VARIABLE=$(echo "DEPENDENCY_REBUILT_$1" | sed "s/\-/\_/g")
-    export ${DEPENDENCY_REBUILT_VARIABLE}=1
-}
-
 # ENABLE COMMON FUNCTIONS
 . ${BASEDIR}/build/ios-common.sh
 
@@ -105,7 +41,7 @@ fi
 # FILTERING WHICH EXTERNAL LIBRARIES WILL BE BUILT
 # NOTE THAT BUILT-IN LIBRARIES ARE FORWARDED TO FFMPEG SCRIPT WITHOUT ANY PROCESSING
 enabled_library_list=()
-for library in {1..33}
+for library in {1..31}
 do
     if [[ ${!library} -eq 1 ]]; then
         ENABLED_LIBRARY=$(get_library_name $((library - 1)))
@@ -142,7 +78,7 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                 fi
             ;;
             libass)
-                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_libiconv ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]] && [[ ! -z $OK_libpng ]]; then
+                if [[ ! -z $OK_libuuid ]] && [[ ! -z $OK_expat ]] && [[ ! -z $OK_libiconv ]] && [[ ! -z $OK_freetype ]] && [[ ! -z $OK_fribidi ]] && [[ ! -z $OK_fontconfig ]]; then
                     run=1
                 fi
             ;;
@@ -166,16 +102,6 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                     run=1
                 fi
             ;;
-            nettle)
-                if [[ ! -z $OK_gmp ]]; then
-                    run=1
-                fi
-            ;;
-            tiff)
-                if [[ ! -z $OK_jpeg ]]; then
-                    run=1
-                fi
-            ;;
             *)
                 run=1
             ;;
@@ -183,17 +109,16 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
 
         BUILD_COMPLETED_FLAG=$(echo "OK_${library}" | sed "s/\-/\_/g")
         REBUILD_FLAG=$(echo "REBUILD_${library}" | sed "s/\-/\_/g")
-        DEPENDENCY_REBUILT_FLAG=$(echo "DEPENDENCY_REBUILT_${library}" | sed "s/\-/\_/g")
 
         if [ $run -eq 1 ] && [[ -z ${!BUILD_COMPLETED_FLAG} ]]; then
             ENABLED_LIBRARY_PATH="${INSTALL_BASE}/${library}"
 
             LIBRARY_IS_INSTALLED=$(library_is_installed ${INSTALL_BASE} ${library})
 
-            echo -e "INFO: Flags detected for ${library}: already installed=${LIBRARY_IS_INSTALLED}, rebuild=${!REBUILD_FLAG}, dependency rebuilt=${!DEPENDENCY_REBUILT_FLAG}\n" >> ${BASEDIR}/build.log
+            echo -e "INFO: Flags detected for ${library}: already installed=${LIBRARY_IS_INSTALLED}, rebuild=${!REBUILD_FLAG}\n" >> ${BASEDIR}/build.log
 
             # DECIDE TO BUILD OR NOT
-            if [[ ${LIBRARY_IS_INSTALLED} -ne 0 ]] || [[ ${!REBUILD_FLAG} -eq 1 ]] || [[ ${!DEPENDENCY_REBUILT_FLAG} -eq 1 ]]; then
+            if [[ ${LIBRARY_IS_INSTALLED} -ne 0 ]] || [[ ${!REBUILD_FLAG} -eq 1 ]]; then
 
                 echo -e "----------------------------------------------------------------" >> ${BASEDIR}/build.log
                 echo -e "\nINFO: Building $library with the following environment variables\n" >> ${BASEDIR}/build.log
@@ -219,7 +144,6 @@ while [ ${#enabled_library_list[@]} -gt $completed ]; do
                 if [ $? -eq 0 ]; then
                     (( completed+=1 ))
                     declare "$BUILD_COMPLETED_FLAG=1"
-                    check_if_dependency_rebuilt ${library}
                     echo "ok"
                 else
                     echo "failed"

docs/android/doc/html/d7/d44/abidetect_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -257,7 +257,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d7/d44/abidetect_8h_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -71,7 +71,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d7/d7f/log_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -299,7 +299,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d7/d7f/log_8h_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -71,7 +71,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d7/df8/log_8c.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -438,7 +438,7 @@ Variables</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d7/df8/log_8c_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -84,7 +84,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d8/da5/mobileffmpeg_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -74,7 +74,7 @@ $(function() {
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
 Macros</h2></td></tr>
-<tr class="memitem:ab40bb25ef4ec0f35c70e84dbad36cfc2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d8/da5/mobileffmpeg_8h.html#ab40bb25ef4ec0f35c70e84dbad36cfc2">MOBILE_FFMPEG_VERSION</a>&#160;&#160;&#160;&quot;2.0&quot;</td></tr>
+<tr class="memitem:ab40bb25ef4ec0f35c70e84dbad36cfc2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d8/da5/mobileffmpeg_8h.html#ab40bb25ef4ec0f35c70e84dbad36cfc2">MOBILE_FFMPEG_VERSION</a>&#160;&#160;&#160;&quot;1.2&quot;</td></tr>
 <tr class="separator:ab40bb25ef4ec0f35c70e84dbad36cfc2"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
@@ -94,7 +94,7 @@ Functions</h2></td></tr>
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define MOBILE_FFMPEG_VERSION&#160;&#160;&#160;&quot;2.0&quot;</td>
+          <td class="memname">#define MOBILE_FFMPEG_VERSION&#160;&#160;&#160;&quot;1.2&quot;</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -232,7 +232,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d9/d7e/abidetect_8c.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -204,7 +204,7 @@ Variables</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/d9/d7e/abidetect_8c_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -82,7 +82,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/dd/d16/mobileffmpeg_8c.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -326,7 +326,7 @@ Variables</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/dd/d16/mobileffmpeg_8c_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -80,7 +80,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/dd/d2d/exception_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -97,7 +97,7 @@ Variables</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/dd/d2d/exception_8h_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -70,7 +70,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/files.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -80,7 +80,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/globals.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -213,7 +213,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/globals_defs.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -109,7 +109,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/globals_func.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -102,7 +102,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/globals_vars.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -106,7 +106,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/doc/html/index.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg Android API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -69,7 +69,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:21 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:38:43 for MobileFFmpeg Android API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/android/javadoc/allclasses-frame.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>All Classes (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/android/javadoc/allclasses-noframe.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>All Classes (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/Abi.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:23 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>Abi (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/AbiDetect.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>AbiDetect (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/FFmpeg.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>FFmpeg (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/Log.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>Log (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/package-frame.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>com.arthenica.mobileffmpeg (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/package-summary.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>com.arthenica.mobileffmpeg (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/com/arthenica/mobileffmpeg/package-tree.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>com.arthenica.mobileffmpeg Class Hierarchy (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>

docs/android/javadoc/constant-values.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>Constant Field Values (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/android/javadoc/deprecated-list.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>Deprecated List (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/android/javadoc/help-doc.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>API Help (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/android/javadoc/index-all.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>Index (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/android/javadoc/index.html

@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>MobileFFmpeg</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;

docs/android/javadoc/overview-tree.html

@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_162) on Sun Jun 03 20:26:24 EET 2018 -->
+<!-- Generated by javadoc (1.8.0_172) on Thu Aug 16 11:39:04 EET 2018 -->
 <title>Class Hierarchy (MobileFFmpeg)</title>
-<meta name="date" content="2018-06-03">
+<meta name="date" content="2018-08-16">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

docs/ios/html/d1/d82/archdetect_8m.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -102,7 +102,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d1/d82/archdetect_8m_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -71,7 +71,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d2/df2/log_8m.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -273,7 +273,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d2/df2/log_8m_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -75,7 +75,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d4/d43/exception_8c.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -97,7 +97,7 @@ Variables</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d4/d43/exception_8c_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -71,7 +71,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d5/d47/archdetect_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -221,7 +221,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d5/d47/archdetect_8h_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -71,7 +71,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d7/d7f/log_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -287,7 +287,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d7/d7f/log_8h_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -74,7 +74,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/d8/da5/mobileffmpeg_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -74,7 +74,7 @@ $(function() {
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
 Macros</h2></td></tr>
-<tr class="memitem:ab40bb25ef4ec0f35c70e84dbad36cfc2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d8/da5/mobileffmpeg_8h.html#ab40bb25ef4ec0f35c70e84dbad36cfc2">MOBILE_FFMPEG_VERSION</a>&#160;&#160;&#160;&quot;2.0&quot;</td></tr>
+<tr class="memitem:ab40bb25ef4ec0f35c70e84dbad36cfc2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="../../d8/da5/mobileffmpeg_8h.html#ab40bb25ef4ec0f35c70e84dbad36cfc2">MOBILE_FFMPEG_VERSION</a>&#160;&#160;&#160;&quot;1.2&quot;</td></tr>
 <tr class="separator:ab40bb25ef4ec0f35c70e84dbad36cfc2"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a>
@@ -94,7 +94,7 @@ Functions</h2></td></tr>
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define MOBILE_FFMPEG_VERSION&#160;&#160;&#160;&quot;2.0&quot;</td>
+          <td class="memname">#define MOBILE_FFMPEG_VERSION&#160;&#160;&#160;&quot;1.2&quot;</td>
         </tr>
       </table>
 </div><div class="memdoc">
@@ -191,7 +191,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/dd/d16/mobileffmpeg_8c.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -198,7 +198,7 @@ Functions</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/dd/d16/mobileffmpeg_8c_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -76,7 +76,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/dd/d2d/exception_8h.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -97,7 +97,7 @@ Variables</h2></td></tr>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/dd/d2d/exception_8h_source.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -70,7 +70,7 @@ $(function() {
 </div><!-- fragment --></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="../../doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/files.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -81,7 +81,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/globals.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -134,7 +134,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/globals_defs.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -91,7 +91,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/globals_func.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -106,7 +106,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/globals_vars.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -71,7 +71,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

docs/ios/html/index.html

@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td id="projectalign" style="padding-left: 0.5em;">
    <div id="projectname">MobileFFmpeg IOS API
-   &#160;<span id="projectnumber">2.0</span>
+   &#160;<span id="projectnumber">1.2</span>
    </div>
   </td>
  </tr>
@@ -69,7 +69,7 @@ $(function() {
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Fri Jun 29 2018 21:32:14 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Aug 16 2018 11:39:32 for MobileFFmpeg IOS API by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.14
 </small></address>

ios.sh

@@ -31,26 +31,24 @@ LIBRARY_XVIDCORE=19
 LIBRARY_LIBILBC=20
 LIBRARY_OPUS=21
 LIBRARY_SNAPPY=22
-LIBRARY_SOXR=23
-LIBRARY_LIBAOM=24
-LIBRARY_GIFLIB=25
-LIBRARY_JPEG=26
-LIBRARY_LIBOGG=27
-LIBRARY_LIBPNG=28
-LIBRARY_LIBUUID=29
-LIBRARY_NETTLE=30
-LIBRARY_TIFF=31
-LIBRARY_EXPAT=32
-LIBRARY_ZLIB=33
-LIBRARY_AUDIOTOOLBOX=34
-LIBRARY_COREIMAGE=35
-LIBRARY_BZIP2=36
+LIBRARY_GIFLIB=23
+LIBRARY_JPEG=24
+LIBRARY_LIBOGG=25
+LIBRARY_LIBPNG=26
+LIBRARY_LIBUUID=27
+LIBRARY_NETTLE=28
+LIBRARY_TIFF=29
+LIBRARY_EXPAT=30
+LIBRARY_ZLIB=31
+LIBRARY_AUDIOTOOLBOX=32
+LIBRARY_COREIMAGE=33
+LIBRARY_BZIP2=34
 
 # ENABLE ARCH
 ENABLED_ARCHITECTURES=(1 1 1 1 1)
 
 # ENABLE LIBRARIES
-ENABLED_LIBRARIES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
+ENABLED_LIBRARIES=(0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0)
 
 export BASEDIR=$(pwd)
 
@@ -59,9 +57,6 @@ export MOBILE_FFMPEG_TMPDIR="${BASEDIR}/.tmp"
 # MIN VERSION IOS7
 export IOS_MIN_VERSION=7.0
 
-# UPDATE THIS TO 8.0 WHEN GNUTLS IS UPGRADED TO 3.6.x line
-export GNUTLS_IOS_MIN_VERSION=7.0
-
 get_mobile_ffmpeg_version() {
     local MOBILE_FFMPEG_VERSION=$(grep '#define MOBILE_FFMPEG_VERSION' ${BASEDIR}/ios/src/mobileffmpeg.h | grep -Eo '\".*\"' | sed -e 's/\"//g')
 
@@ -111,7 +106,6 @@ When compilation ends a universal fat binary and an IOS framework is created wit
     echo -e "  --enable-gnutls\t\tbuild with gnutls [no]"
     echo -e "  --enable-kvazaar\t\tbuild with kvazaar [no]"
     echo -e "  --enable-lame\t\t\tbuild with lame [no]"
-    echo -e "  --enable-libaom\t\tbuild with libaom [no]"
     echo -e "  --enable-libass\t\tbuild with libass [no]"
     echo -e "  --enable-libiconv\t\tbuild with libiconv [no]"
     echo -e "  --enable-libilbc\t\tbuild with libilbc [no]"
@@ -124,7 +118,6 @@ When compilation ends a universal fat binary and an IOS framework is created wit
     echo -e "  --enable-opus\t\t\tbuild with opus [no]"
     echo -e "  --enable-shine\t\tbuild with shine [no]"
     echo -e "  --enable-snappy\t\tbuild with snappy [no]"
-    echo -e "  --enable-soxr\t\t\tbuild with soxr [no]"
     echo -e "  --enable-speex\t\tbuild with speex [no]"
     echo -e "  --enable-wavpack\t\tbuild with wavpack [no]\n"
 
@@ -202,8 +195,8 @@ set_library() {
         ;;
         gnutls)
             ENABLED_LIBRARIES[LIBRARY_GNUTLS]=$2
+            ENABLED_LIBRARIES[LIBRARY_NETTLE]=$2
             ENABLED_LIBRARIES[LIBRARY_ZLIB]=$2
-            set_library "nettle" $2
             set_library "gmp" $2
             set_library "libiconv" $2
         ;;
@@ -214,9 +207,6 @@ set_library() {
             ENABLED_LIBRARIES[LIBRARY_LAME]=$2
             set_library "libiconv" $2
         ;;
-        libaom)
-            ENABLED_LIBRARIES[LIBRARY_LIBAOM]=$2
-        ;;
         libass)
             ENABLED_LIBRARIES[LIBRARY_LIBASS]=$2
             ENABLED_LIBRARIES[LIBRARY_LIBUUID]=$2
@@ -252,7 +242,7 @@ set_library() {
             ENABLED_LIBRARIES[LIBRARY_LIBWEBP]=$2
             ENABLED_LIBRARIES[LIBRARY_GIFLIB]=$2
             ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
-            set_library "tiff" $2
+            ENABLED_LIBRARIES[LIBRARY_TIFF]=$2
             set_library "libpng" $2
         ;;
         libxml2)
@@ -272,9 +262,6 @@ set_library() {
             ENABLED_LIBRARIES[LIBRARY_SNAPPY]=$2
             ENABLED_LIBRARIES[LIBRARY_ZLIB]=$2
         ;;
-        soxr)
-            ENABLED_LIBRARIES[LIBRARY_SOXR]=$2
-        ;;
         speex)
             ENABLED_LIBRARIES[LIBRARY_SPEEX]=$2
         ;;
@@ -287,15 +274,7 @@ set_library() {
         xvidcore)
             ENABLED_LIBRARIES[LIBRARY_XVIDCORE]=$2
         ;;
-        tiff)
-            ENABLED_LIBRARIES[LIBRARY_TIFF]=$2
-            ENABLED_LIBRARIES[LIBRARY_JPEG]=$2
-        ;;
-        nettle)
-            ENABLED_LIBRARIES[LIBRARY_NETTLE]=$2
-            set_library "gmp" $2
-        ;;
-        giflib | jpeg | libogg | libpng | libuuid | expat)
+        giflib | jpeg | libogg | libpng | libuuid | nettle | tiff | expat)
             # THESE LIBRARIES ARE NOT ENABLED DIRECTLY
         ;;
         *)
@@ -374,7 +353,7 @@ print_enabled_libraries() {
     let enabled=0;
 
     # FIRST BUILT-IN LIBRARIES
-    for library in {33..36}
+    for library in {31..34}
     do
         if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
             if [[ ${enabled} -ge 1 ]]; then
@@ -386,7 +365,7 @@ print_enabled_libraries() {
     done
 
     # THEN EXTERNAL LIBRARIES
-    for library in {0..24}
+    for library in {0..22}
     do
         if [[ ${ENABLED_LIBRARIES[$library]} -eq 1 ]]; then
             if [[ ${enabled} -ge 1 ]]; then
@@ -467,7 +446,7 @@ do
             rebuild_library ${BUILD_LIBRARY}
 	    ;;
 	    --full)
-            for library in {0..36}
+            for library in {0..34}
             do
                 if [[ $library -ne 18 ]] && [[ $library -ne 19 ]]; then
                     enable_library $(get_library_name $library)
@@ -543,11 +522,10 @@ do
         TARGET_ARCH_LIST+=(${TARGET_ARCH})
 
         # CLEAR FLAGS
-        for library in {1..37}
+        for library in {1..35}
         do
             library_name=$(get_library_name $((library - 1)))
             unset $(echo "OK_${library_name}" | sed "s/\-/\_/g")
-            unset $(echo "DEPENDENCY_REBUILT_${library_name}" | sed "s/\-/\_/g")
         done
     fi
 done
@@ -691,20 +669,19 @@ if [[ ! -z ${TARGET_ARCH_LIST} ]]; then
     do
         for TARGET_ARCH in "${TARGET_ARCH_LIST[@]}"
         do
-            ## TRY NOT TO USE HARDCODED VERSION NUMBERS
             install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/mobile-ffmpeg/lib/libmobileffmpeg.0.dylib @rpath/mobileffmpeg.framework/mobileffmpeg ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
 
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavcodec.58.dylib @rpath/libavcodec.framework/libavcodec ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavdevice.58.dylib @rpath/libavdevice.framework/libavdevice ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavfilter.7.dylib @rpath/libavfilter.framework/libavfilter ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavformat.58.dylib @rpath/libavformat.framework/libavformat ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libswresample.3.dylib @rpath/libswresample.framework/libswresample ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libswscale.5.dylib @rpath/libswscale.framework/libswscale ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
-            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavutil.56.dylib @rpath/libavutil.framework/libavutil ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavcodec.57.dylib @rpath/libavcodec.framework/libavcodec ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavdevice.57.dylib @rpath/libavdevice.framework/libavdevice ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavfilter.6.dylib @rpath/libavfilter.framework/libavfilter ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavformat.57.dylib @rpath/libavformat.framework/libavformat ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libswresample.2.dylib @rpath/libswresample.framework/libswresample ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libswscale.4.dylib @rpath/libswscale.framework/libswscale ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
+            install_name_tool -change ${BASEDIR}/prebuilt/ios-${TARGET_ARCH}-apple-darwin/ffmpeg/lib/libavutil.55.dylib @rpath/libavutil.framework/libavutil ${BASEDIR}/prebuilt/ios-framework/${ONE_LIB}.framework/${ONE_LIB}
         done
     done
 
     echo -e "Created mobile-ffmpeg.framework successfully.\n" >> ${BASEDIR}/build.log
 
     echo -e "ok\n"
-fi
+fi

ios/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MobileFFmpeg IOS API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.0
+PROJECT_NUMBER         = 1.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a