Commit 0dbc30bd authored by cehoyos's avatar cehoyos

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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20860 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9e14edba
...@@ -902,7 +902,7 @@ static enum PixelFormat avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask, ...@@ -902,7 +902,7 @@ static enum PixelFormat avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask,
enum PixelFormat dst_pix_fmt; enum PixelFormat dst_pix_fmt;
/* find exact color match with smallest size */ /* find exact color match with smallest size */
dst_pix_fmt = -1; dst_pix_fmt = PIX_FMT_NONE;
min_dist = 0x7fffffff; min_dist = 0x7fffffff;
for(i = 0;i < PIX_FMT_NB; i++) { for(i = 0;i < PIX_FMT_NB; i++) {
if (pix_fmt_mask & (1ULL << 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 ...@@ -945,7 +945,7 @@ enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelForma
if (loss_mask == 0) if (loss_mask == 0)
break; break;
} }
return -1; return PIX_FMT_NONE;
found: found:
if (loss_ptr) if (loss_ptr)
*loss_ptr = avcodec_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha); *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