From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 6 Dec 2012 00:35:31 +0000 (+0100)
Subject: Revert "Add assert that the avcodec lock is held when initializing static VLC tables."
X-Git-Tag: android-x86-4.4-r1~7465
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eed865540af889eba9e51aada71d9483f13445e9;p=android-x86%2Fexternal-ffmpeg.git

Revert "Add assert that the avcodec lock is held when initializing static VLC tables."

This reverts commit dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4.
---

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index e986300be1..ce83ee01f9 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -30,7 +30,6 @@
 
 #include "libavutil/avassert.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "mathops.h"
 #include "get_bits.h"
 #include "put_bits.h"
@@ -276,7 +275,6 @@ 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;