# HG changeset patch # User cehoyos # Date 1223883731 0 # Node ID 76f6a08c9fe633697c416011c9549c565ca340ca # Parent 21c3e313709ef275fa1cfc2efa6a12bd68ed68af Fix some icc warnings by using enum PixelFormat instead of int where appropriate. diff -r 21c3e313709e -r 76f6a08c9fe6 raw.c --- a/raw.c Mon Oct 13 00:10:53 2008 +0000 +++ b/raw.c Mon Oct 13 07:42:11 2008 +0000 @@ -52,7 +52,7 @@ { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') }, { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ - { -1, 0 }, + { PIX_FMT_NONE, 0 }, }; unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) diff -r 21c3e313709e -r 76f6a08c9fe6 raw.h --- a/raw.h Mon Oct 13 00:10:53 2008 +0000 +++ b/raw.h Mon Oct 13 07:42:11 2008 +0000 @@ -30,7 +30,7 @@ #include "avcodec.h" typedef struct PixelFormatTag { - int pix_fmt; + enum PixelFormat pix_fmt; unsigned int fourcc; } PixelFormatTag; diff -r 21c3e313709e -r 76f6a08c9fe6 rawdec.c --- a/rawdec.c Mon Oct 13 00:10:53 2008 +0000 +++ b/rawdec.c Mon Oct 13 07:42:11 2008 +0000 @@ -40,7 +40,7 @@ { PIX_FMT_RGB555, 16 }, { PIX_FMT_BGR24, 24 }, { PIX_FMT_RGB32, 32 }, - { -1, 0 }, + { PIX_FMT_NONE, 0 }, }; static const PixelFormatTag pixelFormatBpsMOV[] = { @@ -51,10 +51,10 @@ { PIX_FMT_BGR555, 16 }, { PIX_FMT_RGB24, 24 }, { PIX_FMT_BGR32_1, 32 }, - { -1, 0 }, + { PIX_FMT_NONE, 0 }, }; -static int findPixelFormat(const PixelFormatTag *tags, unsigned int fourcc) +static enum PixelFormat findPixelFormat(const PixelFormatTag *tags, unsigned int fourcc) { while (tags->pix_fmt >= 0) { if (tags->fourcc == fourcc)