diff options
| author | David Conrad <lessen42@gmail.com> | 2010-02-13 18:55:27 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2010-02-13 18:55:27 +0000 |
| commit | eb691ef219860fa6432d460cdd8edc9dff4886db (patch) | |
| tree | d69c7ec8896c07b4aaa8884c14eba64917d9ce8f | |
| parent | 15675ce6098c403454a78307254a2ced36cf342f (diff) | |
Directly check whether a fragment is coded for 4MV mode instead of iterating
through the entire coded fragment list.
Originally committed as revision 21803 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vp3.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 8b7ff42668..b63b12659e 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -735,7 +735,7 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb) */ 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 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) 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)]; |