Mercurial > libavcodec.hg
changeset 4655:f0ce30e115ac libavcodec
dont malloc() static mv_penalty arrays
author | michael |
---|---|
date | Tue, 13 Mar 2007 22:47:05 +0000 |
parents | bda54c0d6766 |
children | f5499f9c2dbe |
files | h263.c mpeg12.c mpegvideo.c |
diffstat | 3 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Tue Mar 13 22:01:06 2007 +0000 +++ b/h263.c Tue Mar 13 22:47:05 2007 +0000 @@ -87,7 +87,7 @@ 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 @@ 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;
--- a/mpeg12.c Tue Mar 13 22:01:06 2007 +0000 +++ b/mpeg12.c Tue Mar 13 22:47:05 2007 +0000 @@ -94,7 +94,7 @@ 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 @@ 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;
--- a/mpegvideo.c Tue Mar 13 22:01:06 2007 +0000 +++ b/mpegvideo.c Tue Mar 13 22:47:05 2007 +0000 @@ -107,7 +107,7 @@ }; #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 @@ 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++){