Fixes error: libavcodec/videotoolbox.c:511:18: error: implicit declaration of function 'CMVideoFormatDescriptionCreateFromH264ParameterSets' is invalid in C99
This was added in 10.9: https://developer.apple.com/reference/coremedia/1489818-cmvideoformatdescriptioncreatefr?language=objc --- libavcodec/videotoolbox.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 502b2e3..7b5245a 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -495,6 +495,8 @@ static CMVideoFormatDescriptionRef videotoolbox_format_desc_create(AVCodecContex { CMFormatDescriptionRef cm_fmt_desc = NULL; int status; + +#if TARGET_OS_IPHONE || defined(__MAC_10_9) H264Context *h = codec_type == kCMVideoCodecType_H264 ? avctx->priv_data : NULL; if (h && h->ps.sps->data_size && h->ps.pps->data_size) { @@ -522,6 +524,7 @@ static CMVideoFormatDescriptionRef videotoolbox_format_desc_create(AVCodecContex return NULL; } } else { +#endif status = CMVideoFormatDescriptionCreate(kCFAllocatorDefault, codec_type, width, @@ -533,7 +536,9 @@ static CMVideoFormatDescriptionRef videotoolbox_format_desc_create(AVCodecContex av_log(avctx, AV_LOG_ERROR, "Error creating format description: %d\n", status); return NULL; } +#if TARGET_OS_IPHONE || defined(__MAC_10_9) } +#endif return cm_fmt_desc; } -- 2.4.5
0001-Fix-videotoolbox-compile-error-on-OS-X-10.8.patch
Description: Binary data
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
