Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
2c3901b2
Commit
2c3901b2
authored
Jul 01, 2013
by
Michael Niedermayer
Committed by
Luca Barbato
Jul 02, 2013
Browse files
jpeg2000: Remove unneeded returns
Signed-off-by:
Luca Barbato
<
lu_zero@gentoo.org
>
parent
ef35d6db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
libavcodec/jpeg2000.c
libavcodec/jpeg2000.c
+0
-2
libavcodec/jpeg2000dec.c
libavcodec/jpeg2000dec.c
+1
-5
No files found.
libavcodec/jpeg2000.c
View file @
2c3901b2
...
...
@@ -115,7 +115,6 @@ static int getsigctxno(int flag, int bandno)
return
2
;
if
(d
==
1)
return
1
;
return
0
;
}
else
{
if
(d
>=
3)
return
8
;
...
...
@@ -135,7 +134,6 @@ static int getsigctxno(int flag, int bandno)
return
2
;
if
(h
+
v
==
1)
return
1
;
return
0
;
}
return
0
;
}
...
...
libavcodec/jpeg2000dec.c
View file @
2c3901b2
...
...
@@ -992,7 +992,6 @@ static void dequantization_float(int x, int y, Jpeg2000Cblk *cblk,
idx
=
(comp->coord[0][1]
-
comp->coord[0][0])
*
j
+
i
;
datap[idx]
=
(float)(t1->data[j][i])
*
((float)band->stepsize)
;
}
return
;
}
/* Integer dequantization of a codeblock.*/
...
...
@@ -1009,7 +1008,6 @@ static void dequantization_int(int x, int y, Jpeg2000Cblk *cblk,
datap[idx]
=
((int32_t)(t1->data[j][i])
*
((int32_t)band->stepsize)
+
(1
<<
15))
>>
16
;
}
return
;
}
/* Inverse ICT parameters in float and integer.
...
...
@@ -1027,10 +1025,9 @@ static const int i_ict_params[4] = {
116130
};
static
int
mct_decode
(
Jpeg2000DecoderContext
*
s
,
Jpeg2000Tile
*
tile
)
static
void
mct_decode
(
Jpeg2000DecoderContext
*
s
,
Jpeg2000Tile
*
tile
)
{
int
i,
csize
=
1
;
int
ret
=
0
;
int32_t
*src[3],
i0,
i1,
i2
;
float
*srcf[3],
i0f,
i1f,
i2f
;
...
...
@@ -1076,7 +1073,6 @@ static int mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile)
}
break
;
}
return
ret
;
}
static
int
jpeg2000_decode_tile
(
Jpeg2000DecoderContext
*
s
,
Jpeg2000Tile
*
tile
,
...
...
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