Skip to content

Instantly share code, notes, and snippets.

@rcombs

rcombs/stdin Secret

Created March 3, 2016 03:41
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rcombs/baffbb647ab6c1a18ac8 to your computer and use it in GitHub Desktop.
Save rcombs/baffbb647ab6c1a18ac8 to your computer and use it in GitHub Desktop.
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);
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment