diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index d0cf50d9e8..c88830cafc 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -52,7 +52,7 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
     { 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 --git a/libavcodec/raw.h b/libavcodec/raw.h
index e600dca395..2fbf2d6605 100644
--- a/libavcodec/raw.h
+++ b/libavcodec/raw.h
@@ -30,7 +30,7 @@
 #include "avcodec.h"
 
 typedef struct PixelFormatTag {
-    int pix_fmt;
+    enum PixelFormat pix_fmt;
     unsigned int fourcc;
 } PixelFormatTag;
 
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)