mirror of https://git.ffmpeg.org/ffmpeg.git
fixed static init
Originally committed as revision 1799 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fab219971e
commit
59cf08ce90
|
@ -2489,12 +2489,11 @@ static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
|
|||
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;
|
||||
|
||||
if (!init_done) {
|
||||
for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
|
||||
for(i=0;i<MAX_NEG_CROP;i++) {
|
||||
cropTbl[i] = 0;
|
||||
|
@ -2506,9 +2505,12 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
|
|||
}
|
||||
|
||||
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
|
||||
if(avctx->dct_algo==FF_DCT_FASTINT)
|
||||
|
|
|
@ -245,6 +245,7 @@ typedef struct DSPContext {
|
|||
|
||||
} DSPContext;
|
||||
|
||||
void dsputil_static_init(void);
|
||||
void dsputil_init(DSPContext* p, AVCodecContext *avctx);
|
||||
|
||||
/**
|
||||
|
|
|
@ -555,7 +555,7 @@ void avcodec_init(void)
|
|||
return;
|
||||
inited = 1;
|
||||
|
||||
//dsputil_init();
|
||||
dsputil_static_init();
|
||||
}
|
||||
|
||||
/* this can be called after seeking and before trying to decode the next keyframe */
|
||||
|
|
Loading…
Reference in New Issue