avformat/mpegtsenc: move is_dvb_subtitle/is_dvb_teletext initialization upwards

[ffmpeg] / libavfilter / glslang.cpp

diff --git a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
index 497df6e245c47397a4858bddf88ad8398dcb3595..986bddd789d0b42bab547097e2326fc82b38a298 100644 (file)
--- a/libavfilter/glslang.cpp
+++ b/libavfilter/glslang.cpp
@@ -24,7 +24,6 @@ extern "C" {
 }
 
 #include <glslang/Include/ResourceLimits.h>
-#include <glslang/Include/revision.h>
 #include <glslang/Public/ShaderLang.h>
 #include <glslang/SPIRV/GlslangToSpv.h>
 
@@ -236,8 +235,7 @@ int glslang_init(void)
 void glslang_uninit(void)
 {
     pthread_mutex_lock(&glslang_mutex);
-    av_assert0(glslang_refcount > 0);
-    if (--glslang_refcount == 0)
+    if (glslang_refcount && (--glslang_refcount == 0))
         FinalizeProcess();
     pthread_mutex_unlock(&glslang_mutex);
 }