changeset 11152:b3ff7fcfffc4 libavcodec

Directly check whether a fragment is coded for 4MV mode instead of iterating through the entire coded fragment list.
author conrad
date Sat, 13 Feb 2010 18:55:27 +0000
parents d649b7f938c8
children 3827267cc207
files vp3.c
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/vp3.c	Sat Feb 13 18:55:24 2010 +0000
+++ b/vp3.c	Sat Feb 13 18:55:27 2010 +0000
@@ -735,7 +735,7 @@
  */
 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb)
 {
-    int j, k, l, sb_x, sb_y;
+    int j, k, sb_x, sb_y;
     int coding_mode;
     int motion_x[6];
     int motion_y[6];
@@ -802,10 +802,7 @@
                 motion_x[4] = motion_y[4] = 0;
                 for (k = 0; k < 4; k++) {
                     current_fragment = BLOCK_Y*s->fragment_width + BLOCK_X;
-                    for (l = 0; l < s->coded_fragment_list_index; l++)
-                        if (s->coded_fragment_list[l] == current_fragment)
-                            break;
-                    if (l < s->coded_fragment_list_index) {
+                    if (s->all_fragments[current_fragment].coding_method != MODE_COPY) {
                         if (coding_mode == 0) {
                             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)];