diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-04-16 01:01:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-04-16 01:01:45 +0000 |
| commit | 137c8468e840e31f9399997b95e02341c67d0a31 (patch) | |
| tree | 5b05f1f9d27b864e880fb9842a7b24b07f4b7ede /libavcodec/rv10.c | |
| parent | 37f5cd5a18a8e08a18814d1aca828c92ee398d10 (diff) | |
| download | ffmpeg-streaming-137c8468e840e31f9399997b95e02341c67d0a31.zip ffmpeg-streaming-137c8468e840e31f9399997b95e02341c67d0a31.tar.gz | |
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
minor +-1 bugfix
Originally committed as revision 3016 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
| -rw-r--r-- | libavcodec/rv10.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index be7eb43..b67ec39 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -564,10 +564,6 @@ static int rv10_decode_packet(AVCodecContext *avctx, return -1; } - if(s->pict_type == B_TYPE){ //FIXME remove after cleaning mottion_val indexing - memset(s->current_picture.motion_val[0], 0, sizeof(int16_t)*2*(s->mb_width*2+2)*(s->mb_height*2+2)); - } - #ifdef DEBUG printf("qscale=%d\n", s->qscale); #endif @@ -600,9 +596,9 @@ static int rv10_decode_packet(AVCodecContext *avctx, s->block_wrap[0]= s->block_wrap[1]= s->block_wrap[2]= - s->block_wrap[3]= s->mb_width*2 + 2; + s->block_wrap[3]= s->b8_stride; s->block_wrap[4]= - s->block_wrap[5]= s->mb_width + 2; + s->block_wrap[5]= s->mb_stride; ff_init_block_index(s); /* decode each macroblock */ @@ -677,10 +673,6 @@ static int rv10_decode_frame(AVCodecContext *avctx, return -1; } - if(s->pict_type == B_TYPE){ //FIXME remove after cleaning mottion_val indexing - memset(s->current_picture.motion_val[0], 0, sizeof(int16_t)*2*(s->mb_width*2+2)*(s->mb_height*2+2)); - } - if(s->mb_y>=s->mb_height){ MPV_frame_end(s); |
