[FFmpeg-cvslog] Revert " Add assert that the avcodec lock is held when initializing static VLC tables ."
Michael Niedermayer
git at videolan.org
Thu Dec 6 03:17:37 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 6 01:35:31 2012 +0100| [eed865540af889eba9e51aada71d9483f13445e9] | committer: Michael Niedermayer
Revert "Add assert that the avcodec lock is held when initializing static VLC tables."
This reverts commit dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eed865540af889eba9e51aada71d9483f13445e9
---
libavcodec/bitstream.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index e986300..ce83ee0 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;
More information about the ffmpeg-cvslog
mailing list