Commit f0bc8449 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files

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
parent 1f15747f
......@@ -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);
......
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