mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-18 07:15:04 +02:00
fix 4MV MC and reinstate new MC VLC
Originally committed as revision 4273 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7919d97e6d
commit
f4daf33ee8
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user