From f0bc8449b89a95c656523b9e0c6b3722575f0977 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 14 Dec 2009 11:18:28 +0000 Subject: Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings). Originally committed as revision 20860 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/imgconvert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/imgconvert.c') diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 0746c58550..5dc7b92ee0 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -902,7 +902,7 @@ static enum PixelFormat avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask, enum PixelFormat dst_pix_fmt; /* find exact color match with smallest size */ - dst_pix_fmt = -1; + dst_pix_fmt = PIX_FMT_NONE; min_dist = 0x7fffffff; for(i = 0;i < PIX_FMT_NB; i++) { if (pix_fmt_mask & (1ULL << i)) { @@ -945,7 +945,7 @@ enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelForma if (loss_mask == 0) break; } - return -1; + return PIX_FMT_NONE; found: if (loss_ptr) *loss_ptr = avcodec_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); -- cgit v1.2.3