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
83070254
Commit
83070254
authored
Mar 30, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpegdec: Fix "assignment from incompatible pointer type" warnings
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
03757d48
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
mjpegdec.c
libavcodec/mjpegdec.c
+2
-2
No files found.
libavcodec/mjpegdec.c
View file @
83070254
...
...
@@ -862,7 +862,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
pred
&=
(
-
1
)
<<
(
8
-
s
->
bits
);
*
ptr
=
pred
+
(
dc
<<
point_transform
);
}
else
{
ptr16
=
s
->
picture
.
data
[
c
]
+
2
*
(
linesize
*
(
v
*
mb_y
+
y
))
+
2
*
(
h
*
mb_x
+
x
);
//FIXME optimize this crap
ptr16
=
(
uint16_t
*
)(
s
->
picture
.
data
[
c
]
+
2
*
(
linesize
*
(
v
*
mb_y
+
y
))
+
2
*
(
h
*
mb_x
+
x
)
);
//FIXME optimize this crap
if
(
y
==
0
&&
toprow
){
if
(
x
==
0
&&
leftcol
){
pred
=
1
<<
(
bits
-
1
);
...
...
@@ -918,7 +918,7 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
pred
&=
(
-
1
)
<<
(
8
-
s
->
bits
);
*
ptr
=
pred
+
(
dc
<<
point_transform
);
}
else
{
ptr16
=
s
->
picture
.
data
[
c
]
+
2
*
(
linesize
*
(
v
*
mb_y
+
y
))
+
2
*
(
h
*
mb_x
+
x
);
//FIXME optimize this crap
ptr16
=
(
uint16_t
*
)(
s
->
picture
.
data
[
c
]
+
2
*
(
linesize
*
(
v
*
mb_y
+
y
))
+
2
*
(
h
*
mb_x
+
x
)
);
//FIXME optimize this crap
PREDICT
(
pred
,
ptr16
[
-
linesize
-
1
],
ptr16
[
-
linesize
],
ptr16
[
-
1
],
predictor
);
pred
&=
(
-
1
)
<<
(
16
-
s
->
bits
);
...
...
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