diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-21 22:22:51 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-21 22:22:51 +0200 |
| commit | 91450cda2ee112c45e5c7ce1dd5651b811ecad8c (patch) | |
| tree | 472cd2140c0edfabc1b77e01ee01e7fbb99c176e /ffmpeg_vaapi.c | |
| parent | 475a686a0157a4f0243a0df4a02fadf469e5159c (diff) | |
| parent | 0c1d66a07917602303f129f5a5651faeec2415d5 (diff) | |
| download | ffmpeg-91450cda2ee112c45e5c7ce1dd5651b811ecad8c.tar.gz | |
Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'
* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
avconv_vaapi: fix double-free with some unsupported streams
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'ffmpeg_vaapi.c')
| -rw-r--r-- | ffmpeg_vaapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_vaapi.c b/ffmpeg_vaapi.c index c6bb9ee747..d76c121f32 100644 --- a/ffmpeg_vaapi.c +++ b/ffmpeg_vaapi.c @@ -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; } |