Commit 95240bf3 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files

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
parent 40056c32
......@@ -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)
......
......@@ -30,7 +30,7 @@
#include "avcodec.h"
typedef struct PixelFormatTag {
int pix_fmt;
enum PixelFormat pix_fmt;
unsigned int fourcc;
} PixelFormatTag;
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment