[vlc-commits] avcodec: fix potential multiple free of hwaccel module

[Rémi Denis-Courmont]

vlc/vlc-2.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jul 19 18:54:49 2013 +0300| [c0d701b7467257d8f7576779139b450bc1812d3f] | committer: Rémi Denis-Courmont

avcodec: fix potential multiple free of hwaccel module

(cherry picked from commit 701413ebf56b6dcf3096f2c2afbec04f4d66f63a)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=c0d701b7467257d8f7576779139b450bc1812d3f
---

 modules/codec/avcodec/video.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 07c785e..9e1bc21 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1166,9 +1166,8 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
     msg_Err( p_dec, "acceleration not available" );
     vlc_va_Delete( p_va );
 
-    p_sys->p_va = NULL;
-
 end:
     /* Fallback to default behaviour */
+    p_sys->p_va = NULL;
     return avcodec_default_get_format( p_context, pi_fmt );
 }