Commit 59cf08ce authored by Fabrice Bellard's avatar Fabrice Bellard

fixed static init

Originally committed as revision 1799 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fab21997
...@@ -2489,26 +2489,28 @@ static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block) ...@@ -2489,26 +2489,28 @@ static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
add_pixels_clamped_c(block, dest, line_size); add_pixels_clamped_c(block, dest, line_size);
} }
void dsputil_init(DSPContext* c, AVCodecContext *avctx) /* init static data */
void dsputil_static_init(void)
{ {
static int init_done = 0;
int i; int i;
if (!init_done) { for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i; for(i=0;i<MAX_NEG_CROP;i++) {
for(i=0;i<MAX_NEG_CROP;i++) { cropTbl[i] = 0;
cropTbl[i] = 0; cropTbl[i + MAX_NEG_CROP + 256] = 255;
cropTbl[i + MAX_NEG_CROP + 256] = 255; }
}
for(i=0;i<512;i++) {
for(i=0;i<512;i++) { squareTbl[i] = (i - 256) * (i - 256);
squareTbl[i] = (i - 256) * (i - 256); }
}
for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
}
for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
init_done = 1; void dsputil_init(DSPContext* c, AVCodecContext *avctx)
} {
int i;
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
if(avctx->dct_algo==FF_DCT_FASTINT) if(avctx->dct_algo==FF_DCT_FASTINT)
......
...@@ -245,6 +245,7 @@ typedef struct DSPContext { ...@@ -245,6 +245,7 @@ typedef struct DSPContext {
} DSPContext; } DSPContext;
void dsputil_static_init(void);
void dsputil_init(DSPContext* p, AVCodecContext *avctx); void dsputil_init(DSPContext* p, AVCodecContext *avctx);
/** /**
......
...@@ -555,7 +555,7 @@ void avcodec_init(void) ...@@ -555,7 +555,7 @@ void avcodec_init(void)
return; return;
inited = 1; inited = 1;
//dsputil_init(); dsputil_static_init();
} }
/* this can be called after seeking and before trying to decode the next keyframe */ /* this can be called after seeking and before trying to decode the next keyframe */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment