Commit 91450cda authored by Clément Bœsch's avatar Clément Bœsch

Merge commit '0c1d66a0'

* commit '0c1d66a0':
  avconv_vaapi: fix double-free with some unsupported streams
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 475a686a 0c1d66a0
...@@ -243,7 +243,7 @@ static int vaapi_build_decoder_config(VAAPIDecoderContext *ctx, ...@@ -243,7 +243,7 @@ static int vaapi_build_decoder_config(VAAPIDecoderContext *ctx,
alt_profile = vaapi_profile_map[i].codec_profile; alt_profile = vaapi_profile_map[i].codec_profile;
} }
} }
av_free(profile_list); av_freep(&profile_list);
if (profile == VAProfileNone) { if (profile == VAProfileNone) {
av_log(ctx, loglevel, "No VAAPI support for codec %s.\n", av_log(ctx, loglevel, "No VAAPI support for codec %s.\n",
...@@ -374,7 +374,7 @@ fail: ...@@ -374,7 +374,7 @@ fail:
av_hwframe_constraints_free(&constraints); av_hwframe_constraints_free(&constraints);
av_freep(&hwconfig); av_freep(&hwconfig);
vaDestroyConfig(hwctx->display, ctx->va_config); vaDestroyConfig(hwctx->display, ctx->va_config);
av_free(profile_list); av_freep(&profile_list);
return err; return err;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment