[FFmpeg-cvslog] ffmpeg/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT
Clément Bœsch
git at videolan.org
Thu Oct 15 10:27:24 CEST 2015
ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Thu Oct 15 10:21:52 2015 +0200| [3041618516930d768d0d0a6f5b206e0fcfe0f8f4] | committer: Clément Bœsch
ffmpeg/videotoolbox: protect UTGetOSTypeFromString on both VDA and VT
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3041618516930d768d0d0a6f5b206e0fcfe0f8f4
---
ffmpeg_videotoolbox.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ffmpeg_videotoolbox.c b/ffmpeg_videotoolbox.c
index c9355fa..744a2a0 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);
}
More information about the ffmpeg-cvslog
mailing list