projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e8a368
)
ico: consider IconEntry.NumColors of 255 to be ambiguous
author
Peter Ross
<pross@xvid.org>
Thu, 12 Jan 2012 12:41:38 +0000
(23:41 +1100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 12 Jan 2012 15:32:55 +0000
(16:32 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/icodec.c
patch
|
blob
|
history
diff --git
a/libavformat/icodec.c
b/libavformat/icodec.c
index
e539b02
..
214d477
100644
(file)
--- a/
libavformat/icodec.c
+++ b/
libavformat/icodec.c
@@
-76,6
+76,8
@@
static int read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->width = avio_r8(pb);
st->codec->height = avio_r8(pb);
ico->images[i].nb_pal = avio_r8(pb);
+ if (ico->images[i].nb_pal == 255)
+ ico->images[i].nb_pal = 0;
avio_skip(pb, 3);
st->codec->bits_per_coded_sample = avio_rl16(pb);