[vlc-devel] [PATCH 2/2] videotoolbox: switch to C instead of Objective-C

[Marvin Scholz]

---
 extras/package/macosx/VLC.xcodeproj/project.pbxproj |  4 ++--
 modules/codec/Makefile.am                           | 10 +++++-----
 modules/codec/{videotoolbox.m => videotoolbox.c}    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename modules/codec/{videotoolbox.m => videotoolbox.c} (99%)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 76c85cb66d..e9fdfcee69 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -437,7 +437,7 @@
 		6BF56C3D1FCF00AF004A411A /* audiotoolbox_midi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audiotoolbox_midi.c; path = ../../../modules/codec/audiotoolbox_midi.c; sourceTree = "<group>"; };
 		6BF5C5021EFE66EF008A9C12 /* VLCHUDTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDTableView.h; sourceTree = "<group>"; };
 		6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDTableView.m; sourceTree = "<group>"; };
-		7D0A387820CBCC4D00D4BF3B /* videotoolbox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = videotoolbox.m; path = ../../../modules/codec/videotoolbox.m; sourceTree = "<group>"; };
+		7D0A387820CBCC4D00D4BF3B /* videotoolbox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = videotoolbox.c; path = ../../../modules/codec/videotoolbox.c; sourceTree = "<group>"; };
 		7D0F5A992264EB410009C48A /* VLCHotkeysController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCHotkeysController.h; sourceTree = "<group>"; };
 		7D0F5A9A2264EB410009C48A /* VLCHotkeysController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCHotkeysController.m; sourceTree = "<group>"; };
 		7D0F63FD2201F63400FDB91F /* VLCPlaylistTableCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistTableCellView.h; sourceTree = "<group>"; };
@@ -1347,7 +1347,7 @@
 		6BF56C3C1FCF0088004A411A /* codec */ = {
 			isa = PBXGroup;
 			children = (
-				7D0A387820CBCC4D00D4BF3B /* videotoolbox.m */,
+				7D0A387820CBCC4D00D4BF3B /* videotoolbox.c */,
 				6BF56C3D1FCF00AF004A411A /* audiotoolbox_midi.c */,
 			);
 			name = codec;
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 06d6095ac4..fad41d0885 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -339,21 +339,21 @@ codec_LTLIBRARIES += $(LTLIBoggspots)
 
 libvideotoolbox_plugin_la_SOURCES = \
 	codec/vt_utils.c codec/vt_utils.h \
-	codec/videotoolbox.m codec/hxxx_helper.c codec/hxxx_helper.h \
+	codec/videotoolbox.c codec/hxxx_helper.c codec/hxxx_helper.h \
 	packetizer/hxxx_nal.h packetizer/hxxx_nal.c \
 	packetizer/hxxx_sei.h packetizer/hxxx_sei.c \
 	packetizer/h264_slice.c packetizer/h264_slice.h \
 	packetizer/h264_nal.c packetizer/h264_nal.h \
 	packetizer/hevc_nal.c packetizer/hevc_nal.h
-libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
+libvideotoolbox_plugin_la_CFLAGS = $(AM_CFLAGS)
 if HAVE_IOS
-libvideotoolbox_plugin_la_OBJCFLAGS += -miphoneos-version-min=9.0
+libvideotoolbox_plugin_la_CFLAGS += -miphoneos-version-min=9.0
 endif
 if HAVE_TVOS
-libvideotoolbox_plugin_la_OBJCFLAGS += -mtvos-version-min=10.2
+libvideotoolbox_plugin_la_CFLAGS += -mtvos-version-min=10.2
 endif
 libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la
-libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
+libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
 EXTRA_LTLIBRARIES += libvideotoolbox_plugin.la
 codec_LTLIBRARIES += $(LTLIBvideotoolbox)
 
diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.c
similarity index 99%
rename from modules/codec/videotoolbox.m
rename to modules/codec/videotoolbox.c
index 8a2d3a1c8f..8d791d34d7 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * videotoolbox.m: Video Toolbox decoder
+ * videotoolbox.c: Video Toolbox decoder
  *****************************************************************************
  * Copyright © 2014-2015 VideoLabs SAS
  *
-- 
2.20.1 (Apple Git-117)