diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-04-25 18:57:04 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-04-25 18:57:04 +0000 |
| commit | a2a44876712f079610f0396fb9a682ea47e05b6e (patch) | |
| tree | 1f3e328dfe6a5f9fa7c79e7a23bf6310be2827fd /src/libffmpeg/libavcodec/wmv2.c | |
| parent | acb7dc0f256afc24e875a168da989ef25d86b7b7 (diff) | |
| download | xine-lib-a2a44876712f079610f0396fb9a682ea47e05b6e.tar.gz xine-lib-a2a44876712f079610f0396fb9a682ea47e05b6e.tar.bz2 | |
ffmpeg sync
CVS patchset: 6437
CVS date: 2004/04/25 18:57:04
Diffstat (limited to 'src/libffmpeg/libavcodec/wmv2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/wmv2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libffmpeg/libavcodec/wmv2.c b/src/libffmpeg/libavcodec/wmv2.c index 130a7f89d..376f0706e 100644 --- a/src/libffmpeg/libavcodec/wmv2.c +++ b/src/libffmpeg/libavcodec/wmv2.c @@ -181,7 +181,7 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) put_bits(&s->pb, 1, s->dc_table_index); put_bits(&s->pb, 1, s->mv_table_index); - s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); + s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); } s->esc3_level_length= 0; s->esc3_run_length= 0; @@ -216,7 +216,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, wmv2_inter_table[w->cbp_table_index][cbp + 64][0]); /* motion vector */ - h263_pred_motion(s, 0, &pred_x, &pred_y); + h263_pred_motion(s, 0, 0, &pred_x, &pred_y); msmpeg4_encode_motion(s, motion_x - pred_x, motion_y - pred_y); } else { @@ -443,7 +443,7 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s) s->dc_table_index = get_bits1(&s->gb); s->mv_table_index = get_bits1(&s->gb); - s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); + s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE); s->no_rounding ^= 1; if(s->avctx->debug&FF_DEBUG_PICT_INFO){ @@ -504,7 +504,7 @@ static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){ int xy, wrap, diff, type; int16_t *A, *B, *C, *mot_val; - wrap = s->block_wrap[0]; + wrap = s->b8_stride; xy = s->block_index[0]; mot_val = s->current_picture.motion_val[0][xy]; |