ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'

Browse Source 
* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
  avconv_vaapi: fix double-free with some unsupported streams

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2016-06-21 22:22:51 +02:00
commit 91450cda2e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg_vaapi.c
View File

@ -243,7 +243,7 @@ static int vaapi_build_decoder_config(VAAPIDecoderContext *ctx,
alt_profile = vaapi_profile_map[i].codec_profile;
}
}
av_free(profile_list);
av_freep(&profile_list);
if (profile == VAProfileNone) {
av_log(ctx, loglevel, "No VAAPI support for codec %s.\n",
@ -374,7 +374,7 @@ fail:
av_hwframe_constraints_free(&constraints);
av_freep(&hwconfig);
vaDestroyConfig(hwctx->display, ctx->va_config);
av_free(profile_list);
av_freep(&profile_list);
return err;
}