Add VP56_FRAME_NONE and use VP56_FRAME_CURRENT.
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Tue, 13 May 2008 15:56:45 +0000 (15:56 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Tue, 13 May 2008 15:56:45 +0000 (15:56 +0000)
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13145 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/vp56.c
libavcodec/vp56data.h

index 559d4a3..c9daaf7 100644 (file)
@@ -552,12 +552,12 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         s->prev_dc[2][VP56_FRAME_CURRENT] = 128;
 
         for (block=0; block < 4*s->mb_width+6; block++) {
         s->prev_dc[2][VP56_FRAME_CURRENT] = 128;
 
         for (block=0; block < 4*s->mb_width+6; block++) {
-            s->above_blocks[block].ref_frame = -1;
+            s->above_blocks[block].ref_frame = VP56_FRAME_NONE;
             s->above_blocks[block].dc_coeff = 0;
             s->above_blocks[block].not_null_dc = 0;
         }
             s->above_blocks[block].dc_coeff = 0;
             s->above_blocks[block].not_null_dc = 0;
         }
-        s->above_blocks[2*s->mb_width + 2].ref_frame = 0;
-        s->above_blocks[3*s->mb_width + 4].ref_frame = 0;
+        s->above_blocks[2*s->mb_width + 2].ref_frame = VP56_FRAME_CURRENT;
+        s->above_blocks[3*s->mb_width + 4].ref_frame = VP56_FRAME_CURRENT;
 
         stride_y  = p->linesize[0];
         stride_uv = p->linesize[1];
 
         stride_y  = p->linesize[0];
         stride_uv = p->linesize[1];
@@ -573,7 +573,7 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                 mb_row_flip = mb_row;
 
             for (block=0; block<4; block++) {
                 mb_row_flip = mb_row;
 
             for (block=0; block<4; block++) {
-                s->left_block[block].ref_frame = -1;
+                s->left_block[block].ref_frame = VP56_FRAME_NONE;
                 s->left_block[block].dc_coeff = 0;
                 s->left_block[block].not_null_dc = 0;
             }
                 s->left_block[block].dc_coeff = 0;
                 s->left_block[block].not_null_dc = 0;
             }
index 6dfb8eb..e9fe8bb 100644 (file)
@@ -27,6 +27,7 @@
 #include "libavutil/common.h"
 
 typedef enum {
 #include "libavutil/common.h"
 
 typedef enum {
+    VP56_FRAME_NONE     =-1,
     VP56_FRAME_CURRENT  = 0,
     VP56_FRAME_PREVIOUS = 1,
     VP56_FRAME_GOLDEN   = 2,
     VP56_FRAME_CURRENT  = 0,
     VP56_FRAME_PREVIOUS = 1,
     VP56_FRAME_GOLDEN   = 2,