aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-06 01:35:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-06 02:52:07 +0100
commiteed865540af889eba9e51aada71d9483f13445e9 (patch)
tree4e55806fc3dd7e03a37de09864feb9432599a246
parentd7169280a64964b90cab6d1e87725fd36605ff85 (diff)
downloadffmpeg-eed865540af889eba9e51aada71d9483f13445e9.tar.gz
Revert "Add assert that the avcodec lock is held when initializing static VLC tables."
This reverts commit dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4.
-rw-r--r--libavcodec/bitstream.c2
1 files changed, 0 insertions, 2 deletions
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;