har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Originally committed as revision 20860 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Carl Eugen Hoyos 2009-12-14 11:18:28 +00:00
parent 1f15747fc9
commit f0bc8449b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/imgconvert.c
View File

@ -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
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);