diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-14 11:18:28 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-12-14 11:18:28 +0000 |
| commit | f0bc8449b89a95c656523b9e0c6b3722575f0977 (patch) | |
| tree | 2de1b747e8863254283038cfb5994811572dd071 /libavcodec/imgconvert.c | |
| parent | 1f15747fc9650e6ee338c1e037f475eadd29c0be (diff) | |
| download | ffmpeg-f0bc8449b89a95c656523b9e0c6b3722575f0977.tar.gz | |
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
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 0746c58550..5dc7b92ee0 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); |