[FFmpeg-cvslog] avdevice/decklink_common: Fix Decklink for Mac
Georg Lippitsch
git at videolan.org
Sun Feb 8 04:44:54 CET 2015
ffmpeg | branch: master | Georg Lippitsch <georg.lippitsch at gmx.at> | Sun Jan 11 15:38:46 2015 +0100| [62ea5ae2b567a770e5e106493bcad59a9098cb8d] | committer: Michael Niedermayer
avdevice/decklink_common: Fix Decklink for Mac
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62ea5ae2b567a770e5e106493bcad59a9098cb8d
---
libavdevice/decklink_common.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
index 07e1651..82b8bdb 100644
--- a/libavdevice/decklink_common.cpp
+++ b/libavdevice/decklink_common.cpp
@@ -70,6 +70,16 @@ static char *dup_wchar_to_utf8(wchar_t *w)
#define DECKLINK_STR OLECHAR *
#define DECKLINK_STRDUP dup_wchar_to_utf8
#define DECKLINK_FREE(s) SysFreeString(s)
+#elif __APPLE__
+static char *dup_cfstring_to_utf8(CFStringRef w)
+{
+ char s[256];
+ CFStringGetCString(w, s, 255, kCFStringEncodingUTF8);
+ return av_strdup(s);
+}
+#define DECKLINK_STR const __CFString *
+#define DECKLINK_STRDUP dup_cfstring_to_utf8
+#define DECKLINK_FREE(s) free((void *) s)
#else
#define DECKLINK_STR const char *
#define DECKLINK_STRDUP av_strdup
More information about the ffmpeg-cvslog
mailing list