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
15071ed4
Commit
15071ed4
authored
Sep 05, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/mjpegdec fix last_dc for bits != 8
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
ae57e824
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
mjpegdec.c
libavcodec/mjpegdec.c
+3
-3
No files found.
libavcodec/mjpegdec.c
View file @
15071ed4
...
...
@@ -760,7 +760,7 @@ static int handle_rstn(MJpegDecodeContext *s, int nb_components)
if
(
s
->
restart_count
==
0
&&
s
->
avctx
->
codec_id
==
AV_CODEC_ID_THP
){
align_get_bits
(
&
s
->
gb
);
for
(
i
=
0
;
i
<
nb_components
;
i
++
)
/* reset dc */
s
->
last_dc
[
i
]
=
1024
;
s
->
last_dc
[
i
]
=
(
4
<<
s
->
bits
)
;
}
i
=
8
+
((
-
get_bits_count
(
&
s
->
gb
))
&
7
);
...
...
@@ -774,7 +774,7 @@ static int handle_rstn(MJpegDecodeContext *s, int nb_components)
skip_bits
(
&
s
->
gb
,
8
);
if
(
get_bits_left
(
&
s
->
gb
)
>=
8
&&
(
get_bits
(
&
s
->
gb
,
8
)
&
0xF8
)
==
0xD0
)
{
for
(
i
=
0
;
i
<
nb_components
;
i
++
)
/* reset dc */
s
->
last_dc
[
i
]
=
1024
;
s
->
last_dc
[
i
]
=
(
4
<<
s
->
bits
)
;
reset
=
1
;
}
else
skip_bits_long
(
&
s
->
gb
,
pos
-
get_bits_count
(
&
s
->
gb
));
...
...
@@ -1315,7 +1315,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
next_field:
for
(
i
=
0
;
i
<
nb_components
;
i
++
)
s
->
last_dc
[
i
]
=
1024
;
s
->
last_dc
[
i
]
=
(
4
<<
s
->
bits
)
;
if
(
s
->
lossless
)
{
av_assert0
(
s
->
picture_ptr
==
&
s
->
picture
);
...
...
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