[FFmpeg-devel] lavc/videotoolboxenc: Fix compilation on osx 10.10.5 Yosemite

Submitted by Thilo Borgmann on Aug. 9, 2018, 10:55 a.m.

Details

Message ID 4b592ce5-f9c9-8677-8ff9-e7688a807798@mail.de
State Accepted
Commit 72d9b8f4c53ce3de48ba43ddeeccc62f6932b376
Headers show

Commit Message

Thilo Borgmann Aug. 9, 2018, 10:55 a.m.
$Subject

-Thilo
From 07ad940ffe051319591a204463b44f29699a5a4b Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgmann@mail.de>
Date: Thu, 9 Aug 2018 12:47:35 +0200
Subject: [PATCH] lavc/videotoolboxenc: Fix compilation on osx 10.10.5 Yosemite

---
 libavcodec/videotoolboxenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Aman Gupta Aug. 10, 2018, 7:38 p.m.
LGTM, will commit in a few days.

Aman

On Thu, Aug 9, 2018 at 4:56 AM Thilo Borgmann <thilo.borgmann@mail.de>
wrote:

> $Subject
>
> -Thilo
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
Aman Gupta Aug. 14, 2018, 5:03 p.m.
On Fri, Aug 10, 2018 at 12:38 PM Aman Gupta <ffmpeg@tmm1.net> wrote:

> LGTM, will commit in a few days.
>

Applied to master and release/4.0

Thanks!


>
> Aman
>
> On Thu, Aug 9, 2018 at 4:56 AM Thilo Borgmann <thilo.borgmann@mail.de>
> wrote:
>
>> $Subject
>>
>> -Thilo
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>

Patch hide | download patch | download mbox

diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index f311149..50aba2d 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -41,7 +41,7 @@  enum { kCMVideoCodecType_HEVC = 'hvc1' };
 
 typedef OSStatus (*getParameterSetAtIndex)(CMFormatDescriptionRef videoDesc,
                                            size_t parameterSetIndex,
-                                           const uint8_t * _Nullable *parameterSetPointerOut,
+                                           const uint8_t **parameterSetPointerOut,
                                            size_t *parameterSetSizeOut,
                                            size_t *parameterSetCountOut,
                                            int *NALUnitHeaderLengthOut);