diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-05-21 02:06:27 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-05-21 02:06:27 +0000 |
| commit | 7dc9ed1155addbeffb99568fd33d16a08d5bb440 (patch) | |
| tree | 1d755b07cb705d3909f4ead0d2e8a08f746125d2 /libavcodec/vp3.c | |
| parent | 84a96d6a3d6addb15a07d83c1190dbf79dd6b485 (diff) | |
| download | ffmpeg-7dc9ed1155addbeffb99568fd33d16a08d5bb440.tar.gz | |
clean up some warnings and dead code
Originally committed as revision 4288 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 160dcfb5a8..34c780cf23 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -852,9 +852,9 @@ static void init_frame(Vp3DecodeContext *s, GetBitContext *gb) 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 @@ static void render_fragments(Vp3DecodeContext *s, 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 @@ static void render_fragments(Vp3DecodeContext *s, 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); |