Mercurial > libavcodec.hg

changeset 6795:6c7e7fdedfd3 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add VP56_FRAME_NONE and use VP56_FRAME_CURRENT. Fixes icc warning #188: enumerated type mixed with another type
author cehoyos
date Tue, 13 May 2008 15:56:45 +0000
parents ba5913f27124
children b03cd8d29d60
files vp56.c vp56data.h
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/vp56.c	Tue May 13 00:49:38 2008 +0000
+++ b/vp56.c	Tue May 13 15:56:45 2008 +0000
@@ -552,12 +552,12 @@
         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[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];
@@ -573,7 +573,7 @@
                 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;
             }
--- a/vp56data.h	Tue May 13 00:49:38 2008 +0000
+++ b/vp56data.h	Tue May 13 15:56:45 2008 +0000
@@ -27,6 +27,7 @@
 #include "libavutil/common.h"
 
 typedef enum {
+    VP56_FRAME_NONE     =-1,
     VP56_FRAME_CURRENT  = 0,
     VP56_FRAME_PREVIOUS = 1,
     VP56_FRAME_GOLDEN   = 2,