Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
fe300b2a
Commit
fe300b2a
authored
Dec 06, 2018
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/xpmdec: Allow more colours per character.
Fixes ticket #6234.
parent
8affd753
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
xpmdec.c
libavcodec/xpmdec.c
+3
-3
No files found.
libavcodec/xpmdec.c
View file @
fe300b2a
...
@@ -290,10 +290,10 @@ static int ascii2index(const uint8_t *cpixel, int cpp)
...
@@ -290,10 +290,10 @@ static int ascii2index(const uint8_t *cpixel, int cpp)
int
n
=
0
,
m
=
1
,
i
;
int
n
=
0
,
m
=
1
,
i
;
for
(
i
=
0
;
i
<
cpp
;
i
++
)
{
for
(
i
=
0
;
i
<
cpp
;
i
++
)
{
if
(
*
p
<
' '
||
*
p
>
'~'
)
if
(
*
p
<
' '
||
*
p
>
0xfe
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
n
+=
(
*
p
++
-
' '
)
*
m
;
n
+=
(
*
p
++
-
' '
)
*
m
;
m
*=
95
;
m
*=
220
;
}
}
return
n
;
return
n
;
}
}
...
@@ -346,7 +346,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -346,7 +346,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, void *data,
size
=
1
;
size
=
1
;
for
(
i
=
0
;
i
<
cpp
;
i
++
)
for
(
i
=
0
;
i
<
cpp
;
i
++
)
size
*=
95
;
size
*=
220
;
if
(
ncolors
<=
0
||
ncolors
>
size
)
{
if
(
ncolors
<=
0
||
ncolors
>
size
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"invalid number of colors: %d
\n
"
,
ncolors
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"invalid number of colors: %d
\n
"
,
ncolors
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment