diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-11 22:28:43 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-11 22:28:43 +0000 |
| commit | eacced45c47222efebcf66bfced9375a16490e07 (patch) | |
| tree | 6955e28d81e19ae992f6be7812d05714e80456eb /libavcodec/mpeg12.c | |
| parent | 488aca9b1e2eb9136b77e00335b2f529cbb248d2 (diff) | |
| download | ffmpeg-eacced45c47222efebcf66bfced9375a16490e07.tar.gz | |
Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning #188: enumerated type mixed with another type
Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 282d14790a..86e1334a24 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -70,13 +70,13 @@ extern int XVMC_field_end(MpegEncContext *s); 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]; |