diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-08-05 21:36:14 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-08-05 21:36:14 +0000 |
| commit | 508abacadb4249cd0c2c195cff117d8a96b2936f (patch) | |
| tree | 177a7b1fe173a112c3f878f7c1e1505ae1e95de2 /libavcodec/mpegvideo.c | |
| parent | f255af5d93490a6041fa8c9be7bb9d18a0096f94 (diff) | |
| download | ffmpeg-508abacadb4249cd0c2c195cff117d8a96b2936f.tar.gz | |
4mv + bframe decoding bugfix
Originally committed as revision 843 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 654b0e0beb..f08ff6f9eb 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -236,6 +236,9 @@ int MPV_common_init(MpegEncContext *s) /* MV prediction */ size = (2 * s->mb_width + 2) * (2 * s->mb_height + 2); CHECKED_ALLOCZ(s->motion_val, size * 2 * sizeof(INT16)); + + /* 4mv direct mode decoding table */ + CHECKED_ALLOCZ(s->non_b_mv4_table, size * sizeof(UINT8)) } if (s->h263_pred || s->h263_plus) { @@ -324,7 +327,8 @@ void MPV_common_end(MpegEncContext *s) av_freep(&s->tex_pb_buffer); av_freep(&s->pb2_buffer); av_freep(&s->edge_emu_buffer); - + av_freep(&s->non_b_mv4_table); + for(i=0;i<3;i++) { int j; if(!(s->flags&CODEC_FLAG_DR1)){ @@ -1453,6 +1457,9 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) s->motion_val[xy + wrap][1] = motion_y; s->motion_val[xy + 1 + wrap][0] = motion_x; s->motion_val[xy + 1 + wrap][1] = motion_y; + s->non_b_mv4_table[xy]=0; + } else { /* 8X8 */ + s->non_b_mv4_table[xy]=1; } } |