aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rawdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-10-13 07:42:11 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-10-13 07:42:11 +0000
commit95240bf3e3887cf4c04a27f9bd5831051a73d55b (patch)
tree20fe48b29bfc6753e7577883a3674ab07679cbef /libavcodec/rawdec.c
parent40056c32df9fb6db2774dcc0d4f87cbfd759058e (diff)
downloadffmpeg-95240bf3e3887cf4c04a27f9bd5831051a73d55b.tar.gz
Fix some icc warnings by using enum PixelFormat instead of int where appropriate.
Originally committed as revision 15611 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rawdec.c')
-rw-r--r--libavcodec/rawdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 6039f13232..4590b961bf 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -40,7 +40,7 @@ static const PixelFormatTag pixelFormatBpsAVI[] = {
{ 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 pixelFormatBpsMOV[] = {
{ 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)