From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Mon, 14 Dec 2009 11:18:28 +0000 (+0000)
Subject: Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).
X-Git-Tag: v0.6~2318
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0bc8449b89a95c656523b9e0c6b3722575f0977;p=platform%2Fupstream%2Flibav.git

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
---

diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 0746c58..5dc7b92 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);