ffmpeg | branch: master | Mark Thompson <[email protected]> | Mon May  9 18:53:48 
2016 +0100| [0c1d66a07917602303f129f5a5651faeec2415d5] | committer: Luca Barbato

avconv_vaapi: fix double-free with some unsupported streams

Signed-off-by: Luca Barbato <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c1d66a07917602303f129f5a5651faeec2415d5
---

 avconv_vaapi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/avconv_vaapi.c b/avconv_vaapi.c
index a385236..36b34e8 100644
--- a/avconv_vaapi.c
+++ b/avconv_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;
 }
 

_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to