[vlc-commits] opengl: chroma description cannot be NULL, assert it

Rémi Denis-Courmont git at videolan.org
Mon Nov 17 16:47:14 CET 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 17 17:46:09 2014 +0200| [5660fdbbc78f36c648e65ed17c839d202a49048b] | committer: Rémi Denis-Courmont

opengl: chroma description cannot be NULL, assert it

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

 modules/video_output/opengl.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index de4a936..b78bbe0 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -29,6 +29,8 @@
 # include "config.h"
 #endif
 
+#include <assert.h>
+
 #include <vlc_common.h>
 #include <vlc_picture_pool.h>
 #include <vlc_subpicture.h>
@@ -592,7 +594,8 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
         vgl->tex_type     = GL_UNSIGNED_SHORT;
     }
     vgl->chroma = vlc_fourcc_GetChromaDescription(vgl->fmt.i_chroma);
-    vgl->use_multitexture = vgl->chroma && vgl->chroma->plane_count > 1;
+    assert(vgl->chroma != NULL);
+    vgl->use_multitexture = vgl->chroma->plane_count > 1;
 
     /* Texture size */
     for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {



More information about the vlc-commits mailing list