diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-03-13 22:47:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-03-13 22:47:05 +0000 |
| commit | 5ac09151792f77c91c5ffe05c9f78928ac303f04 (patch) | |
| tree | afc66e88622f74a34adee91dce9aed1b810b1a81 /libavcodec | |
| parent | ca2a0c938e30cadb33e1731965bfac4e9215e121 (diff) | |
dont malloc() static mv_penalty arrays
Originally committed as revision 8389 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263.c | 5 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 410c102557..789ece7eac 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -87,7 +87,7 @@ static uint8_t uni_DCtab_chrom_len[512]; static uint16_t uni_DCtab_lum_bits[512]; static uint16_t uni_DCtab_chrom_bits[512]; -static uint8_t (*mv_penalty)[MAX_MV*2+1]= NULL; +static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1]; static uint8_t fcode_tab[MAX_MV*2+1]; static uint8_t umv_fcode_tab[MAX_MV*2+1]; @@ -1797,9 +1797,6 @@ static void init_mv_penalty_and_fcode(MpegEncContext *s) int f_code; int mv; - if(mv_penalty==NULL) - mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); - for(f_code=1; f_code<=MAX_FCODE; f_code++){ for(mv=-MAX_MV; mv<=MAX_MV; mv++){ int len; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 49802b7c93..d0a3885471 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -94,7 +94,7 @@ static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = { PIX_FMT_XVMC_MPEG2_MC, -1}; #ifdef CONFIG_ENCODERS -static uint8_t (*mv_penalty)[MAX_MV*2+1]= NULL; +static uint8_t mv_penalty[MAX_FCODE+1][MAX_MV*2+1]; static uint8_t fcode_tab[MAX_MV*2+1]; static uint8_t uni_mpeg1_ac_vlc_len [64*64*2]; @@ -859,8 +859,6 @@ void ff_mpeg1_encode_init(MpegEncContext *s) mpeg1_chr_dc_uni[i+255]= bits + (code<<8); } - mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); - for(f_code=1; f_code<=MAX_FCODE; f_code++){ for(mv=-MAX_MV; mv<=MAX_MV; mv++){ int len; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 9d7a0a70cc..512bdde4e5 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -107,7 +107,7 @@ static const uint8_t ff_default_chroma_qscale_table[32]={ }; #ifdef CONFIG_ENCODERS -static uint8_t (*default_mv_penalty)[MAX_MV*2+1]=NULL; +static uint8_t default_mv_penalty[MAX_FCODE+1][MAX_MV*2+1]; static uint8_t default_fcode_tab[MAX_MV*2+1]; enum PixelFormat ff_yuv420p_list[2]= {PIX_FMT_YUV420P, -1}; @@ -633,7 +633,6 @@ static void MPV_encode_defaults(MpegEncContext *s){ int i; done=1; - default_mv_penalty= av_mallocz( sizeof(uint8_t)*(MAX_FCODE+1)*(2*MAX_MV+1) ); memset(default_fcode_tab , 0, sizeof(uint8_t)*(2*MAX_MV+1)); for(i=-16; i<16; i++){ |