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:
7feef7d
)
Add assert that the avcodec lock is held when initializing static VLC tables.
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Tue, 27 Nov 2012 20:58:22 +0000
(21:58 +0100)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Wed, 5 Dec 2012 20:01:17 +0000
(21:01 +0100)
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
libavcodec/bitstream.c
patch
|
blob
|
history
diff --git
a/libavcodec/bitstream.c
b/libavcodec/bitstream.c
index
ce83ee0
..
e986300
100644
(file)
--- 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;