From 1cc910726e54d912f7aaa8e9b8bf2cbfb4c16fff Mon Sep 17 00:00:00 2001
From: Mike Melanson <mike@multimedia.cx>
Date: Fri, 9 May 2003 00:25:49 +0000
Subject: routine ffmpeg tree sync; also, remove motion_est.c and ratecontrol.c
 from the Makefile

CVS patchset: 4803
CVS date: 2003/05/09 00:25:49
---
 src/libffmpeg/libavcodec/dsputil.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'src/libffmpeg/libavcodec/dsputil.c')

diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c
index 146a657dd..b9a5f1382 100644
--- a/src/libffmpeg/libavcodec/dsputil.c
+++ b/src/libffmpeg/libavcodec/dsputil.c
@@ -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);
 }
 
-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;
-	    cropTbl[i + MAX_NEG_CROP + 256] = 255;
-	}
-
-	for(i=0;i<512;i++) {
-	    squareTbl[i] = (i - 256) * (i - 256);
-	}
+    for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
+    for(i=0;i<MAX_NEG_CROP;i++) {
+        cropTbl[i] = 0;
+        cropTbl[i + MAX_NEG_CROP + 256] = 255;
+    }
+    
+    for(i=0;i<512;i++) {
+        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
     if(avctx->dct_algo==FF_DCT_FASTINT)
-- 
cgit v1.2.3