[vlc-commits] Revert "vaapi: fix crash on error case"

Thomas Guillem git at videolan.org
Mon Dec 4 09:29:19 CET 2017


vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Dec  4 09:23:04 2017 +0100| [1640df6ea2d579693c86efcf14f8e690b816653d] | committer: Thomas Guillem

Revert "vaapi: fix crash on error case"

This case can't happen anymore.

This reverts commit 10a562ee149e199529f917e53da9c4fc902cf629.

(cherry picked from 37203287ee2b3c6865ce91ad4cc389562662e5d5)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1640df6ea2d579693c86efcf14f8e690b816653d
---

 modules/video_output/opengl/converter_vaapi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
index fe6a578ed3..4e83ab09c5 100644
--- a/modules/video_output/opengl/converter_vaapi.c
+++ b/modules/video_output/opengl/converter_vaapi.c
@@ -305,8 +305,7 @@ Close(vlc_object_t *obj)
     if (priv->last.pic != NULL)
         vaegl_release_last_pic(tc, priv);
 
-    if (priv->vainst)
-        vlc_vaapi_ReleaseInstance(priv->vainst);
+    vlc_vaapi_ReleaseInstance(priv->vainst);
 
     free(tc->priv);
 }



More information about the vlc-commits mailing list