Mercurial > libavcodec.hg

diff mpeg12.c @ 6788:e1302edb0f69 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace some occurrences of -1 with PIX_FMT_NONE. Fixes icc warning #188: enumerated type mixed with another type
author cehoyos
date Sun, 11 May 2008 22:28:43 +0000
parents 5df0c730234d
children e627df327e77
line wrap: on
line diff
--- a/mpeg12.c	Sun May 11 20:26:35 2008 +0000
+++ b/mpeg12.c	Sun May 11 22:28:43 2008 +0000
@@ -70,13 +70,13 @@
 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp);
 extern void XVMC_init_block(MpegEncContext *s);//set s->block
 
-static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1};
-static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1};
-static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1};
+static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,PIX_FMT_NONE};
+static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,PIX_FMT_NONE};
+static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,PIX_FMT_NONE};
 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
                                            PIX_FMT_XVMC_MPEG2_IDCT,
                                            PIX_FMT_XVMC_MPEG2_MC,
-                                           -1};
+                                           PIX_FMT_NONE};
 
 uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];