[FFmpeg-cvslog] r15611 - in trunk/libavcodec: raw.c raw.h rawdec.c

[cehoyos]

Author: cehoyos
Date: Mon Oct 13 09:42:11 2008
New Revision: 15611

Log:
Fix some icc warnings by using enum PixelFormat instead of int where appropriate.

Modified:
   trunk/libavcodec/raw.c
   trunk/libavcodec/raw.h
   trunk/libavcodec/rawdec.c

Modified: trunk/libavcodec/raw.c
==============================================================================
--- trunk/libavcodec/raw.c	(original)
+++ trunk/libavcodec/raw.c	Mon Oct 13 09:42:11 2008
@@ -52,7 +52,7 @@ const PixelFormatTag ff_raw_pixelFormatT
     { 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)

Modified: trunk/libavcodec/raw.h
==============================================================================
--- trunk/libavcodec/raw.h	(original)
+++ trunk/libavcodec/raw.h	Mon Oct 13 09:42:11 2008
@@ -30,7 +30,7 @@
 #include "avcodec.h"
 
 typedef struct PixelFormatTag {
-    int pix_fmt;
+    enum PixelFormat pix_fmt;
     unsigned int fourcc;
 } PixelFormatTag;
 

Modified: trunk/libavcodec/rawdec.c
==============================================================================
--- trunk/libavcodec/rawdec.c	(original)
+++ trunk/libavcodec/rawdec.c	Mon Oct 13 09:42:11 2008
@@ -40,7 +40,7 @@ static const PixelFormatTag pixelFormatB
     { 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 @@ static const PixelFormatTag pixelFormatB
     { 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)