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
a089d567
Commit
a089d567
authored
Mar 22, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/jpeglsdec: support PAL1-PAL7
Fixes Ticket3933 Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
74097e09
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
jpeglsdec.c
libavcodec/jpeglsdec.c
+10
-2
No files found.
libavcodec/jpeglsdec.c
View file @
a089d567
...
@@ -111,12 +111,20 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
...
@@ -111,12 +111,20 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
if
((
s
->
avctx
->
pix_fmt
==
AV_PIX_FMT_GRAY8
||
s
->
avctx
->
pix_fmt
==
AV_PIX_FMT_PAL8
)
&&
if
((
s
->
avctx
->
pix_fmt
==
AV_PIX_FMT_GRAY8
||
s
->
avctx
->
pix_fmt
==
AV_PIX_FMT_PAL8
)
&&
(
s
->
picture_ptr
->
format
==
AV_PIX_FMT_GRAY8
||
s
->
picture_ptr
->
format
==
AV_PIX_FMT_PAL8
))
{
(
s
->
picture_ptr
->
format
==
AV_PIX_FMT_GRAY8
||
s
->
picture_ptr
->
format
==
AV_PIX_FMT_PAL8
))
{
uint32_t
*
pal
=
(
uint32_t
*
)
s
->
picture_ptr
->
data
[
1
];
uint32_t
*
pal
=
(
uint32_t
*
)
s
->
picture_ptr
->
data
[
1
];
int
shift
=
0
;
if
(
s
->
avctx
->
bits_per_raw_sample
>
0
&&
s
->
avctx
->
bits_per_raw_sample
<
8
)
{
maxtab
=
FFMIN
(
maxtab
,
(
1
<<
s
->
avctx
->
bits_per_raw_sample
)
-
1
);
shift
=
8
-
s
->
avctx
->
bits_per_raw_sample
;
}
s
->
picture_ptr
->
format
=
s
->
picture_ptr
->
format
=
s
->
avctx
->
pix_fmt
=
AV_PIX_FMT_PAL8
;
s
->
avctx
->
pix_fmt
=
AV_PIX_FMT_PAL8
;
for
(
i
=
s
->
palette_index
;
i
<=
maxtab
;
i
++
)
{
for
(
i
=
s
->
palette_index
;
i
<=
maxtab
;
i
++
)
{
pal
[
i
]
=
0
;
uint8_t
k
=
i
<<
shift
;
pal
[
k
]
=
0
;
for
(
j
=
0
;
j
<
wt
;
j
++
)
{
for
(
j
=
0
;
j
<
wt
;
j
++
)
{
pal
[
i
]
|=
get_bits
(
&
s
->
gb
,
8
)
<<
(
8
*
(
wt
-
j
-
1
));
pal
[
k
]
|=
get_bits
(
&
s
->
gb
,
8
)
<<
(
8
*
(
wt
-
j
-
1
));
}
}
}
}
s
->
palette_index
=
i
;
s
->
palette_index
=
i
;
...
...
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