From 8f6f357fde0ea88db180db07a6d749ef95f52c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 1 Oct 2015 17:58:40 +0200 Subject: build: restore videotoolbox compilation on iOS --- ffmpeg_videotoolbox.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ffmpeg_videotoolbox.c') diff --git a/ffmpeg_videotoolbox.c b/ffmpeg_videotoolbox.c index 6688452c04..580837efd6 100644 --- a/ffmpeg_videotoolbox.c +++ b/ffmpeg_videotoolbox.c @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_UTGETOSTYPEFROMSTRING #include +#endif #include "config.h" #include "libavcodec/avcodec.h" @@ -168,7 +170,13 @@ int videotoolbox_init(AVCodecContext *s) CFStringRef pixfmt_str = CFStringCreateWithCString(kCFAllocatorDefault, videotoolbox_pixfmt, kCFStringEncodingUTF8); +#if HAVE_UTGETOSTYPEFROMSTRING vdactx->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_vda_default_init2(s, vdactx); CFRelease(pixfmt_str); } -- cgit v1.2.3