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

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.
pull/189/head
Rodger Combs 9 years ago
parent 38cd60c921
commit ecba35bbe3
  1. 14
      libavcodec/videotoolboxenc.c

@ -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);

Loading…
Cancel
Save