Revision
141221
Author
ionic@macports.org
Date
2015-10-12 20:20:09 -0700 (Mon, 12 Oct 2015)

Log Message

ffmpeg-devel: re-enable VDA on 10.11 due to a bug in ffmpeg. Part of #49228.

Modified Paths

Diff

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile (141220 => 141221)


--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-10-13 03:18:15 UTC (rev 141220)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-10-13 03:20:09 UTC (rev 141221)
@@ -12,7 +12,7 @@
 name                ffmpeg-devel
 conflicts           ffmpeg
 version             20150916
-revision            1
+revision            2
 license             LGPL-2.1+
 categories          multimedia
 maintainers         devans jeremyhu openmaintainer
@@ -143,7 +143,10 @@
     }
 
     # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+ up to (excluding) 10.11.
-    if {(${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)) && (${os.major} < 15)} {
+    #if {(${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)) && (${os.major} < 15)}
+    # Due to a bug in ffmpeg(?), we have to enable VDA on 10.11 as well, even though it shouldn't be supported.
+    # More information: https://github.com/mpv-player/mpv/issues/2299
+    if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
         configure.args-delete --disable-vda
         configure.args-append --enable-vda
     }