Mercurial > libavcodec.hg
changeset 8023:76f6a08c9fe6 libavcodec
Fix some icc warnings by using enum PixelFormat instead of int where appropriate.
| author | cehoyos |
|---|---|
| date | Mon, 13 Oct 2008 07:42:11 +0000 |
| parents | 21c3e313709e |
| children | 4f555a34e00f |
| files | raw.c raw.h rawdec.c |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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;
--- 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)