diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-13 15:56:45 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-13 15:56:45 +0000 |
| commit | 738a89b93aefceccc519fed787f5d35d77e9ac73 (patch) | |
| tree | e3659e6319f0254c8d793a0683fafd4f0f9939ca | |
| parent | 696c30688b1894031005e532126e1cef5221c63c (diff) | |
| download | ffmpeg-738a89b93aefceccc519fed787f5d35d77e9ac73.tar.gz | |
Add VP56_FRAME_NONE and use VP56_FRAME_CURRENT.
Fixes icc warning #188: enumerated type mixed with another type
Originally committed as revision 13145 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vp56.c | 8 | ||||
| -rw-r--r-- | libavcodec/vp56data.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 559d4a3468..c9daaf7800 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -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->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 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, 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; } diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index 6dfb8ebf81..e9fe8bb684 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -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, |