Build ffmpeg with x265 for Android

Signed-off-by: Uilian Ries <[email protected]>
conan-io · Jul 15, 2024 · 6ee96ea · 6ee96ea
1 parent 11bc994
commit 6ee96ea
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/recipes/ffmpeg/all/conanfile.py b/recipes/ffmpeg/all/conanfile.py
@@ -270,7 +270,6 @@ def config_options(self):
             self.options.rm_safe("with_libdav1d")
         if self.settings.os == "Android":
             del self.options.with_libfdk_aac
-            del self.options.with_libx265
 
     def configure(self):
         if self.options.shared:
@@ -306,7 +305,7 @@ def requirements(self):
             self.requires("sdl/2.28.5")
         if self.options.with_libx264:
             self.requires("libx264/cci.20220602")
-        if self.options.get_safe("with_libx265"):
+        if self.options.with_libx265:
             self.requires("libx265/3.4")
         if self.options.with_libvpx:
             self.requires("libvpx/1.13.1")
@@ -492,7 +491,7 @@ def opt_append_disable_if_set(args, what, v):
             opt_enable_disable("libzmq", self.options.with_zeromq),
             opt_enable_disable("sdl2", self.options.with_sdl),
             opt_enable_disable("libx264", self.options.with_libx264),
-            opt_enable_disable("libx265", self.options.get_safe("with_libx265")),
+            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.get_safe("with_libfdk_aac")),
@@ -517,8 +516,8 @@ def opt_append_disable_if_set(args, what, v):
             "--disable-cuvid",  # FIXME: CUVID support
             # Licenses
             opt_enable_disable("nonfree", self.options.get_safe("with_libfdk_aac") or (self.options.with_ssl and (
-                self.options.with_libx264 or self.options.get_safe("with_libx265") or self.options.postproc))),
-            opt_enable_disable("gpl", self.options.with_libx264 or self.options.get_safe("with_libx265") or self.options.postproc)
+                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)
         ]
 
         # Individual Component Options
@@ -854,7 +853,7 @@ def _add_component(name, dependencies):
                 avcodec.requires.append("opus::opus")
             if self.options.with_libx264:
                 avcodec.requires.append("libx264::libx264")
-            if self.options.get_safe("with_libx265"):
+            if self.options.with_libx265:
                 avcodec.requires.append("libx265::libx265")
             if self.options.with_libvpx:
                 avcodec.requires.append("libvpx::libvpx")