virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc/videotoolboxenc: remove *_NULLABLE annotations; fixes pre-10.11 build

Browse Source 
These macros were added in OS X 10.11, and the file compiles without warnings
on both 10.10 and 10.11 with them removed.

Thanks to mark4o on IRC for pointing out the failure and testing the patch.
This commit is contained in:
Rodger Combs 2016-03-02 21:44:28 -06:00
parent 38cd60c921
commit ecba35bbe3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/videotoolboxenc.c
View File

@ -317,11 +317,11 @@ static int set_extradata(AVCodecContext *avctx, CMSampleBufferRef sample_buffer)
} }
static void vtenc_output_callback( static void vtenc_output_callback(
void *CM_NULLABLE ctx, void *ctx,
void *sourceFrameCtx, void *sourceFrameCtx,
OSStatus status, OSStatus status,
VTEncodeInfoFlags flags, VTEncodeInfoFlags flags,
CM_NULLABLE CMSampleBufferRef sample_buffer) CMSampleBufferRef sample_buffer)
{ {
AVCodecContext *avctx = ctx; AVCodecContext *avctx = ctx;
VTEncContext *vtctx = avctx->priv_data; VTEncContext *vtctx = avctx->priv_data;
@ -975,11 +975,11 @@ static int get_cv_pixel_info(
#if !TARGET_OS_IPHONE #if !TARGET_OS_IPHONE
//Not used on iOS - frame is always copied. //Not used on iOS - frame is always copied.
static void free_avframe( static void free_avframe(
void *CV_NULLABLE release_ctx, void *release_ctx,
const void *CV_NULLABLE data, const void *data,
size_t size, size_t size,
size_t plane_count, size_t plane_count,
const void *CV_NULLABLE plane_addresses[]) const void *plane_addresses[])
{ {
AVFrame *frame = release_ctx; AVFrame *frame = release_ctx;
av_frame_free(&frame); av_frame_free(&frame);