diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-05-18 17:14:59 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-05-18 17:14:59 +0000 |
| commit | f4daf33ee816e3f1a5b5e78bf5ad9e5859bbab62 (patch) | |
| tree | f37ac9dd28bd77ce328c473336feb784abe22abe /libavcodec/vp3.c | |
| parent | 7919d97e6db122f6dbbaeddd0ce8a57812e3769a (diff) | |
| download | ffmpeg-f4daf33ee816e3f1a5b5e78bf5ad9e5859bbab62.tar.gz | |
fix 4MV MC and reinstate new MC VLC
Originally committed as revision 4273 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 090863467a..0e5d50ac08 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1516,7 +1516,7 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) case MODE_GOLDEN_MV: /* all 6 fragments use the same motion vector */ if (coding_mode == 0) { -#if 0 +#if 1 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; #else @@ -1548,9 +1548,9 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) motion_x[4] = motion_y[4] = 0; for (k = 0; k < 4; k++) { if (coding_mode == 0) { -#if 0 - motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; - motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; +#if 1 + motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; + motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; #else motion_x[k] = get_motion_vector_vlc(gb); motion_y[k] = get_motion_vector_vlc(gb); |