kill av_mallocz_static()
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Mar 2007 12:15:34 +0000 (12:15 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Mar 2007 12:15:34 +0000 (12:15 +0000)
Originally committed as revision 8400 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/dv.c

index 779f353..2bcd507 100644 (file)
@@ -80,7 +80,7 @@ static RL_VLC_ELEM dv_rl_vlc[1184];
 static struct dv_vlc_pair {
    uint32_t vlc;
    uint8_t  size;
-} (*dv_vlc_map)[DV_VLC_MAP_LEV_SIZE] = NULL;
+} dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE];
 
 static void dv_build_unquantize_tables(DVVideoContext *s, uint8_t* perm)
 {
@@ -123,10 +123,6 @@ static int dvvideo_init(AVCodecContext *avctx)
 
         done = 1;
 
-        dv_vlc_map = av_mallocz_static(DV_VLC_MAP_LEV_SIZE*DV_VLC_MAP_RUN_SIZE*sizeof(struct dv_vlc_pair));
-        if (!dv_vlc_map)
-            return AVERROR(ENOMEM);
-
         /* dv_anchor lets each thread know its Id */
         for (i=0; i<DV_ANCHOR_SIZE; i++)
             dv_anchor[i] = (void*)(size_t)i;