#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
+#include "libavutil/thread.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
(flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_OUTPUT_LE);
}
-av_cold void ff_ivi_init_static_vlc(void)
+static av_cold void ivi_init_static_vlc(void)
{
int i;
static VLC_TYPE table_data[8192 * 16][2];
- static int initialized_vlcs = 0;
- if (initialized_vlcs)
- return;
for (i = 0; i < 8; i++) {
ivi_mb_vlc_tabs[i].table = table_data + i * 2 * 8192;
ivi_mb_vlc_tabs[i].table_allocated = 8192;
ivi_create_huff_from_desc(&ivi_blk_huff_desc[i],
&ivi_blk_vlc_tabs[i], 1);
}
- initialized_vlcs = 1;
+}
+
+av_cold void ff_ivi_init_static_vlc(void)
+{
+ static AVOnce init_static_once = AV_ONCE_INIT;
+ ff_thread_once(&init_static_once, ivi_init_static_vlc);
}
/*
int p, b, t;
for (p = 0; p < 3; p++) {
- if (planes[p].bands)
- for (b = 0; b < planes[p].num_bands; b++) {
- av_freep(&planes[p].bands[b].bufs[0]);
- av_freep(&planes[p].bands[b].bufs[1]);
- av_freep(&planes[p].bands[b].bufs[2]);
- av_freep(&planes[p].bands[b].bufs[3]);
-
- if (planes[p].bands[b].blk_vlc.cust_tab.table)
- ff_free_vlc(&planes[p].bands[b].blk_vlc.cust_tab);
- for (t = 0; t < planes[p].bands[b].num_tiles; t++)
- av_freep(&planes[p].bands[b].tiles[t].mbs);
- av_freep(&planes[p].bands[b].tiles);
+ if (planes[p].bands) {
+ for (b = 0; b < planes[p].num_bands; b++) {
+ IVIBandDesc *band = &planes[p].bands[b];
+ av_freep(&band->bufs[0]);
+ av_freep(&band->bufs[1]);
+ av_freep(&band->bufs[2]);
+ av_freep(&band->bufs[3]);
+
+ if (band->blk_vlc.cust_tab.table)
+ ff_free_vlc(&band->blk_vlc.cust_tab);
+ for (t = 0; t < band->num_tiles; t++)
+ av_freep(&band->tiles[t].mbs);
+ av_freep(&band->tiles);
+ }
}
av_freep(&planes[p].bands);
planes[p].num_bands = 0;