Browse Source

fcode_tables where too small, found by Klaas-Pieter Vlieg <vlieg@eurescom.de>

Originally committed as revision 360 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 23 years ago
parent
commit
9c15096e3f
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      libavcodec/h263.c
  2. +1
    -1
      libavcodec/mpeg12.c
  3. +2
    -2
      libavcodec/mpegvideo.c

+ 1
- 1
libavcodec/h263.c View File

@@ -53,7 +53,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s);

extern UINT32 inverse[256];

static UINT16 mv_penalty[MAX_FCODE][MAX_MV*2+1];
static UINT16 mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
static UINT8 fcode_tab[MAX_MV*2+1];
static UINT8 umv_fcode_tab[MAX_MV*2+1];



+ 1
- 1
libavcodec/mpeg12.c View File

@@ -51,7 +51,7 @@ static int mpeg2_decode_block_intra(MpegEncContext *s,
int n);
static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);

static UINT16 mv_penalty[MAX_FCODE][MAX_MV*2+1];
static UINT16 mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
static UINT8 fcode_tab[MAX_MV*2+1];

static void put_header(MpegEncContext *s, int header)


+ 2
- 2
libavcodec/mpegvideo.c View File

@@ -67,7 +67,7 @@ static UINT8 h263_chroma_roundtab[16] = {
0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
};

static UINT16 default_mv_penalty[MAX_FCODE][MAX_MV*2+1];
static UINT16 default_mv_penalty[MAX_FCODE+1][MAX_MV*2+1];
static UINT8 default_fcode_tab[MAX_MV*2+1];

/* default motion estimation */
@@ -366,7 +366,7 @@ int MPV_encode_init(AVCodecContext *avctx)
if(!done){
int i;
done=1;
memset(default_mv_penalty, 0, sizeof(UINT16)*MAX_FCODE*(2*MAX_MV+1));
memset(default_mv_penalty, 0, sizeof(UINT16)*(MAX_FCODE+1)*(2*MAX_MV+1));
memset(default_fcode_tab , 0, sizeof(UINT8)*(2*MAX_MV+1));

for(i=-16; i<16; i++){


Loading…
Cancel
Save