[FFmpeg-cvslog] lavc/xpmdec: Allow more colours per character.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <***@gmail.com> | Thu Dec 6 19:09:56 2018 +0100| [fe300b2ab5d137bfd012060ff7ae50321ae8ac12] | committer: Carl Eugen Hoyos

lavc/xpmdec: Allow more colours per character.

Fixes ticket #6234.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe300b2ab5d137bfd012060ff7ae50321ae8ac12

---

libavcodec/xpmdec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c
index 03172e4aad..1aa40c0655 100644
--- a/libavcodec/xpmdec.c
+++ b/libavcodec/xpmdec.c
@@ -290,10 +290,10 @@ static int ascii2index(const uint8_t *cpixel, int cpp)
int n = 0, m = 1, i;

for (i = 0; i < cpp; i++) {
- if (*p < ' ' || *p > '~')
+ if (*p < ' ' || *p > 0xfe)
return AVERROR_INVALIDDATA;
n += (*p++ - ' ') * m;
- m *= 95;
+ m *= 220;
}
return n;
}
@@ -346,7 +346,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, void *data,

size = 1;
for (i = 0; i < cpp; i++)
- size *= 95;
+ size *= 220;

if (ncolors <= 0 || ncolors > size) {
av_log(avctx, AV_LOG_ERROR, "invalid number of colors: %d\n", ncolors);