summaryrefslogtreecommitdiffstats
path: root/libavcodec/videotoolboxenc.c
diff options
context:
space:
mode:
authorRodger Combs <rodger.combs@gmail.com>2016-03-02 21:44:28 -0600
committerRodger Combs <rodger.combs@gmail.com>2016-03-02 21:44:28 -0600
commitecba35bbe305c022d59da2d7bf066e3325693c26 (patch)
tree4bebac6effa6062b8a44d0b33cd4009d4d56ba2d /libavcodec/videotoolboxenc.c
parent38cd60c921c25393dbffd4cafe4ad768d90b9549 (diff)
downloadffmpeg-streaming-ecba35bbe305c022d59da2d7bf066e3325693c26.zip
ffmpeg-streaming-ecba35bbe305c022d59da2d7bf066e3325693c26.tar.gz
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.
Diffstat (limited to 'libavcodec/videotoolboxenc.c')
-rw-r--r--libavcodec/videotoolboxenc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index bbecb24..3ed1f64 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -317,11 +317,11 @@ static int set_extradata(AVCodecContext *avctx, CMSampleBufferRef sample_buffer)
}
static void vtenc_output_callback(
- void *CM_NULLABLE ctx,
+ void *ctx,
void *sourceFrameCtx,
OSStatus status,
VTEncodeInfoFlags flags,
- CM_NULLABLE CMSampleBufferRef sample_buffer)
+ CMSampleBufferRef sample_buffer)
{
AVCodecContext *avctx = ctx;
VTEncContext *vtctx = avctx->priv_data;
@@ -975,11 +975,11 @@ static int get_cv_pixel_info(
#if !TARGET_OS_IPHONE
//Not used on iOS - frame is always copied.
static void free_avframe(
- void *CV_NULLABLE release_ctx,
- const void *CV_NULLABLE data,
- size_t size,
- size_t plane_count,
- const void *CV_NULLABLE plane_addresses[])
+ void *release_ctx,
+ const void *data,
+ size_t size,
+ size_t plane_count,
+ const void *plane_addresses[])
{
AVFrame *frame = release_ctx;
av_frame_free(&frame);
OpenPOWER on IntegriCloud