OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d716928
)
Revert "Add assert that the avcodec lock is held when initializing static VLC tables."
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 6 Dec 2012 00:35:31 +0000
(
01:35
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 6 Dec 2012 01:52:07 +0000
(
02:52
+0100)
This reverts commit
dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4
.
libavcodec/bitstream.c
patch
|
blob
|
history
diff --git
a/libavcodec/bitstream.c
b/libavcodec/bitstream.c
index
e986300
..
ce83ee0
100644
(file)
--- 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;