generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ff_h263_decode_init_vlc: fix order of operations to avoid failure with 2 threads

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-27 21:28:59 +02:00
parent 5f9cbad603
commit f44be0da94
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ituh263dec.c
View File

@ -102,11 +102,9 @@ static VLC cbpc_b_vlc;
/* XXX: find a better solution to handle static init */ /* XXX: find a better solution to handle static init */
void ff_h263_decode_init_vlc(MpegEncContext *s) void ff_h263_decode_init_vlc(MpegEncContext *s)
{ {
static int done = 0; static volatile int done = 0;
if (!done) { if (!done) {
done = 1;
INIT_VLC_STATIC(&ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9, INIT_VLC_STATIC(&ff_h263_intra_MCBPC_vlc, INTRA_MCBPC_VLC_BITS, 9,
ff_h263_intra_MCBPC_bits, 1, 1, ff_h263_intra_MCBPC_bits, 1, 1,
ff_h263_intra_MCBPC_code, 1, 1, 72); ff_h263_intra_MCBPC_code, 1, 1, 72);
@ -129,6 +127,7 @@ void ff_h263_decode_init_vlc(MpegEncContext *s)
INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4, INIT_VLC_STATIC(&cbpc_b_vlc, CBPC_B_VLC_BITS, 4,
&ff_cbpc_b_tab[0][1], 2, 1, &ff_cbpc_b_tab[0][1], 2, 1,
&ff_cbpc_b_tab[0][0], 2, 1, 8); &ff_cbpc_b_tab[0][0], 2, 1, 8);
done = 1;
} }
} }