highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/videotoolbox: fix SEGV when hwaccel decoding h264 with ffmpeg.c

Browse Source 
Signed-off-by: Aman Gupta <aman@tmm1.net>
This commit is contained in:
Aman Gupta
2017-11-28 08:49:21 -08:00
parent d5d2632e3a
commit b5d56d8ef1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/videotoolbox.c
View File

@@ -119,7 +119,8 @@ CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx)
// save sps header (profile/level) used to create decoder session, // save sps header (profile/level) used to create decoder session,
// so we can detect changes and recreate it. // so we can detect changes and recreate it.
memcpy(vtctx->sps, h->ps.sps->data + 1, 3); if (vtctx)
memcpy(vtctx->sps, h->ps.sps->data + 1, 3);
data = CFDataCreate(kCFAllocatorDefault, vt_extradata, vt_extradata_size); data = CFDataCreate(kCFAllocatorDefault, vt_extradata, vt_extradata_size);
av_free(vt_extradata); av_free(vt_extradata);
@@ -323,6 +324,11 @@ static int videotoolbox_h264_decode_params(AVCodecContext *avctx,
uint32_t size) uint32_t size)
{ {
VTContext *vtctx = avctx->internal->hwaccel_priv_data; VTContext *vtctx = avctx->internal->hwaccel_priv_data;
H264Context *h = avctx->priv_data;
// save sps header (profile/level) used to create decoder session
if (!vtctx->sps[0])
memcpy(vtctx->sps, h->ps.sps->data + 1, 3);
if (type == H264_NAL_SPS) { if (type == H264_NAL_SPS) {
if (size > 4 && memcmp(vtctx->sps, buffer + 1, 3) != 0) { if (size > 4 && memcmp(vtctx->sps, buffer + 1, 3) != 0) {