Fix merge conflicts

Signed-off-by: Uilian Ries <[email protected]>

Author: uilianries

recipes/ffmpeg/all/conanfile.py

@@ -256,6 +256,10 @@ def config_options(self):
             del self.options.with_avfoundation
         if not self._version_supports_libsvtav1:
             self.options.rm_safe("with_libsvtav1")
+        if self.settings.os == "Android":
+            del self.options.with_libfdk_aac
+            # FIXME: https://github.com/conan-io/conan-center-index/issues/23726
+            self.options.rm_safe("with_libdav1d")
 
     def configure(self):
         if self.options.shared:
@@ -280,7 +284,7 @@ def requirements(self):
         if self.options.with_openjpeg:
             self.requires("openjpeg/2.5.2")
         if self.options.with_openh264:
-            self.requires("openh264/2.3.1")
+            self.requires("openh264/2.4.1")
         if self.options.with_vorbis:
             self.requires("vorbis/1.3.7")
         if self.options.with_opus:
@@ -297,7 +301,7 @@ def requirements(self):
             self.requires("libvpx/1.13.1")
         if self.options.with_libmp3lame:
             self.requires("libmp3lame/3.100")
-        if self.options.with_libfdk_aac:
+        if self.options.get_safe("with_libfdk_aac"):
             self.requires("libfdk_aac/2.0.3")
         if self.options.with_libwebp:
             self.requires("libwebp/1.3.2")
@@ -479,7 +483,7 @@ def opt_append_disable_if_set(args, what, v):
             opt_enable_disable("libx265", self.options.with_libx265),
             opt_enable_disable("libvpx", self.options.with_libvpx),
             opt_enable_disable("libmp3lame", self.options.with_libmp3lame),
-            opt_enable_disable("libfdk-aac", self.options.with_libfdk_aac),
+            opt_enable_disable("libfdk-aac", self.options.get_safe("with_libfdk_aac")),
             opt_enable_disable("libwebp", self.options.with_libwebp),
             opt_enable_disable("libaom", self.options.with_libaom),
             opt_enable_disable("openssl", self.options.with_ssl == "openssl"),
@@ -502,7 +506,7 @@ def opt_append_disable_if_set(args, what, v):
             "--disable-cuda",  # FIXME: CUDA support
             "--disable-cuvid",  # FIXME: CUVID support
             # Licenses
-            opt_enable_disable("nonfree", self.options.with_libfdk_aac or (self.options.with_ssl and (
+            opt_enable_disable("nonfree", self.options.get_safe("with_libfdk_aac") or (self.options.with_ssl and (
                 self.options.with_libx264 or self.options.with_libx265 or self.options.postproc))),
             opt_enable_disable("gpl", self.options.with_libx264 or self.options.with_libx265 or self.options.postproc)
         ]
@@ -818,6 +822,8 @@ def _add_component(name, dependencies):
                 avdevice.frameworks.append("AVFoundation")
             if self.options.get_safe("with_audiotoolbox"):
                 avdevice.frameworks.append("CoreAudio")
+            if self.settings.os == "Android" and not self.options.shared:
+                avdevice.system_libs.extend(["android", "camera2ndk", "mediandk"])
 
         if self.options.avcodec:
             if self.options.with_zlib:
@@ -842,7 +848,7 @@ def _add_component(name, dependencies):
                 avcodec.requires.append("libvpx::libvpx")
             if self.options.with_libmp3lame:
                 avcodec.requires.append("libmp3lame::libmp3lame")
-            if self.options.with_libfdk_aac:
+            if self.options.get_safe("with_libfdk_aac"):
                 avcodec.requires.append("libfdk_aac::libfdk_aac")
             if self.options.with_libwebp:
                 avcodec.requires.append("libwebp::libwebp")