[FFmpeg-cvslog] lavd/avfoundation: Use correct preprocessing directive

Vittorio Giovara git at videolan.org
Mon Dec 11 19:38:34 EET 2023


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Dec 11 12:26:55 2023 -0500| [944936ee1d2d52335ff264e3d97cdba868d2486c] | committer: Thilo Borgmann

lavd/avfoundation: Use correct preprocessing directive

Fixes compilation, introduced in e37b15e.

src/libavdevice/avfoundation.m:799:10: error: invalid preprocessing directive
        #elseif (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 140000)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=944936ee1d2d52335ff264e3d97cdba868d2486c
---

 libavdevice/avfoundation.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
index aa892fae60..c1432ec80f 100644
--- a/libavdevice/avfoundation.m
+++ b/libavdevice/avfoundation.m
@@ -796,7 +796,7 @@ static NSArray* getDevicesWithMediaType(AVMediaType mediaType) {
     } else if (mediaType == AVMediaTypeMuxed) {
         #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170000 || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000))
             deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeExternal]];
-        #elseif (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 140000)
+        #elif (TARGET_OS_OSX && __MAC_OS_X_VERSION_MAX_ALLOWED < 140000)
             deviceTypes = [NSMutableArray arrayWithArray:@[AVCaptureDeviceTypeExternalUnknown]];
         #else
             return nil;



More information about the ffmpeg-cvslog mailing list