[FFmpeg-devel] [PATCH 3/3] Add assert that the avcodec lock is held when initializing static VLC tables.

Reimar Döffinger Reimar.Doeffinger at gmx.de
Tue Nov 27 21:59:32 CET 2012


Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
---
 libavcodec/bitstream.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index ce83ee0..e986300 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/avassert.h"
 #include "avcodec.h"
+#include "internal.h"
 #include "mathops.h"
 #include "get_bits.h"
 #include "put_bits.h"
@@ -275,6 +276,7 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
         }else if(vlc->table_size){
             abort(); // fatal error, we are called on a partially initialized table
         }
+        av_assert0(ff_avcodec_locked);
     }else {
         vlc->table = NULL;
         vlc->table_allocated = 0;
-- 
1.7.10.4



More information about the ffmpeg-devel mailing list