[vlc-devel] [vlc-commits] avcodec: fix wrong vlc_va_Delete argument

remi at remlab.net remi at remlab.net
Tue Jun 20 13:00:40 CEST 2017


Oops. Unfortunately, I (now) think that this fix is actually not sufficient.

We really should remove that parameter.

Le 20 juin 2017 13:15:56 GMT+03:00, Thomas Guillem <git at videolan.org> a écrit :
>vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jun 20
>12:13:20 2017 +0200| [35455fb5a8f0efad4cd67959a7a0fa2727082424] |
>committer: Thomas Guillem
>
>avcodec: fix wrong vlc_va_Delete argument
>
>Regression from 41f17efeb747e767bc4fd36e5b0ac2c7a77ab755
>
>This led to a crash with vdpau when va context could not be re-used.
>
>>
>http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35455fb5a8f0efad4cd67959a7a0fa2727082424
>---
>
> modules/codec/avcodec/video.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/modules/codec/avcodec/video.c
>b/modules/codec/avcodec/video.c
>index efda92e628..2cd6521908 100644
>--- a/modules/codec/avcodec/video.c
>+++ b/modules/codec/avcodec/video.c
>@@ -1520,7 +1520,7 @@ static enum PixelFormat ffmpeg_GetFormat(
>AVCodecContext *p_context,
>     if (p_sys->p_va != NULL)
>     {
>     msg_Err(p_dec, "existing hardware acceleration cannot be reused");
>-        vlc_va_Delete(p_sys->p_va, p_context);
>+        vlc_va_Delete(p_sys->p_va, p_context->hwaccel_context);
>         p_sys->p_va = NULL;
>     }
> 
>
>_______________________________________________
>vlc-commits mailing list
>vlc-commits at videolan.org
>https://mailman.videolan.org/listinfo/vlc-commits

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20170620/7270e752/attachment.html>


More information about the vlc-devel mailing list