RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/videotoolbox: Fix videotoolbox compile error on OS X 10.8. 

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
This commit is contained in:
Dan Dennedy 2016-06-19 14:55:18 -07:00 committed by Rick Kern
parent e07b8d68f5
commit b8d754c5d0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/videotoolbox.c
View File

@ -495,6 +495,8 @@ static CMVideoFormatDescriptionRef videotoolbox_format_desc_create(AVCodecContex
{ {
CMFormatDescriptionRef cm_fmt_desc = NULL; CMFormatDescriptionRef cm_fmt_desc = NULL;
int status; int status;
#if TARGET_OS_IPHONE || defined(__MAC_10_9)
H264Context *h = codec_type == kCMVideoCodecType_H264 ? avctx->priv_data : NULL; H264Context *h = codec_type == kCMVideoCodecType_H264 ? avctx->priv_data : NULL;
if (h && h->ps.sps->data_size && h->ps.pps->data_size) { 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; return NULL;
} }
} else { } else {
#endif
status = CMVideoFormatDescriptionCreate(kCFAllocatorDefault, status = CMVideoFormatDescriptionCreate(kCFAllocatorDefault,
codec_type, codec_type,
width, 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); av_log(avctx, AV_LOG_ERROR, "Error creating format description: %d\n", status);
return NULL; return NULL;
} }
#if TARGET_OS_IPHONE || defined(__MAC_10_9)
} }
#endif
return cm_fmt_desc; return cm_fmt_desc;
} }