From 3041618516930d768d0d0a6f5b206e0fcfe0f8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 15 Oct 2015 10:21:52 +0200 Subject: [PATCH] ffmpeg/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT --- ffmpeg_videotoolbox.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ffmpeg_videotoolbox.c b/ffmpeg_videotoolbox.c index c9355fab05..744a2a0009 100644 --- a/ffmpeg_videotoolbox.c +++ b/ffmpeg_videotoolbox.c @@ -157,7 +157,13 @@ int videotoolbox_init(AVCodecContext *s) CFStringRef pixfmt_str = CFStringCreateWithCString(kCFAllocatorDefault, videotoolbox_pixfmt, kCFStringEncodingUTF8); +#if HAVE_UTGETOSTYPEFROMSTRING vtctx->cv_pix_fmt_type = UTGetOSTypeFromString(pixfmt_str); +#else + av_log(s, loglevel, "UTGetOSTypeFromString() is not available " + "on this platform, %s pixel format can not be honored from " + "the command line\n", videotoolbox_pixfmt); +#endif ret = av_videotoolbox_default_init2(s, vtctx); CFRelease(pixfmt_str); }