Mercurial > libavcodec.hg

changeset 2721:7a6db2f4e6c0 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up some warnings and dead code
author melanson
date Sat, 21 May 2005 02:06:27 +0000
parents 4a5ed2d916f6
children b552196f4123
files vp3.c
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/vp3.c	Sat May 21 01:17:20 2005 +0000
+++ b/vp3.c	Sat May 21 02:06:27 2005 +0000
@@ -852,9 +852,9 @@
     s->coded_fragment_list_index = 0;
     for (i = 0; i < s->fragment_count; i++) {
         s->all_fragments[i].coeff_count = 0;
-s->all_fragments[i].motion_x = 0xbeef;
-s->all_fragments[i].motion_y = 0xbeef;
-s->all_fragments[i].next_coeff= NULL;
+        s->all_fragments[i].motion_x = 127;
+        s->all_fragments[i].motion_y = 127;
+        s->all_fragments[i].next_coeff= NULL;
         s->coeffs[i].index=
         s->coeffs[i].coeff=0;
         s->coeffs[i].next= NULL;
@@ -2153,7 +2153,7 @@
                              int height,
                              int plane /* 0 = Y, 1 = U, 2 = V */) 
 {
-    int x, y, j;
+    int x, y;
     int m, n;
     int i = first_fragment;
     int16_t *dequantizer;
@@ -2238,13 +2238,12 @@
 
                     src_x= (motion_x>>1) + x;
                     src_y= (motion_y>>1) + y;
-if ((motion_x == 0xbeef) || (motion_y == 0xbeef))
-av_log(s->avctx, AV_LOG_ERROR, " help! got beefy vector! (%X, %X)\n", motion_x, motion_y);
+                    if ((motion_x == 127) || (motion_y == 127))
+                        av_log(s->avctx, AV_LOG_ERROR, " help! got invalid motion vector! (%X, %X)\n", motion_x, motion_y);
 
                     motion_halfpel_index = motion_x & 0x01;
                     motion_source += (motion_x >> 1);
 
-//                    motion_y = -motion_y;
                     motion_halfpel_index |= (motion_y & 0x01) << 1;
                     motion_source += ((motion_y >> 1) * stride);