[FFmpeg-cvslog] r20860 - trunk/libavcodec/imgconvert.c

[cehoyos]

Author: cehoyos
Date: Mon Dec 14 12:18:28 2009
New Revision: 20860

Log:
Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).

Modified:
   trunk/libavcodec/imgconvert.c

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	Mon Dec 14 11:52:32 2009	(r20859)
+++ trunk/libavcodec/imgconvert.c	Mon Dec 14 12:18:28 2009	(r20860)
@@ -902,7 +902,7 @@ static enum PixelFormat avcodec_find_bes
     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_f
         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);