Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
d1aef7d0
Commit
d1aef7d0
authored
Oct 12, 2017
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/pixlet: remove unecessary intermediate nb_levels variable
This is a change imported from Libav.
parent
368fb748
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
pixlet.c
libavcodec/pixlet.c
+5
-5
No files found.
libavcodec/pixlet.c
View file @
d1aef7d0
...
@@ -420,7 +420,7 @@ static void filterfn(int16_t *dest, int16_t *tmp, unsigned size, int64_t scale)
...
@@ -420,7 +420,7 @@ static void filterfn(int16_t *dest, int16_t *tmp, unsigned size, int64_t scale)
}
}
static
void
reconstruction
(
AVCodecContext
*
avctx
,
int16_t
*
dest
,
static
void
reconstruction
(
AVCodecContext
*
avctx
,
int16_t
*
dest
,
unsigned
width
,
unsigned
height
,
ptrdiff_t
stride
,
int
nb_levels
,
unsigned
width
,
unsigned
height
,
ptrdiff_t
stride
,
int64_t
*
scaling_h
,
int64_t
*
scaling_v
)
int64_t
*
scaling_h
,
int64_t
*
scaling_v
)
{
{
PixletContext
*
ctx
=
avctx
->
priv_data
;
PixletContext
*
ctx
=
avctx
->
priv_data
;
...
@@ -428,11 +428,11 @@ static void reconstruction(AVCodecContext *avctx, int16_t *dest,
...
@@ -428,11 +428,11 @@ static void reconstruction(AVCodecContext *avctx, int16_t *dest,
int16_t
*
ptr
,
*
tmp
;
int16_t
*
ptr
,
*
tmp
;
int
i
,
j
,
k
;
int
i
,
j
,
k
;
scaled_width
=
width
>>
nb_levels
;
scaled_width
=
width
>>
NB_LEVELS
;
scaled_height
=
height
>>
nb_levels
;
scaled_height
=
height
>>
NB_LEVELS
;
tmp
=
ctx
->
filter
[
0
];
tmp
=
ctx
->
filter
[
0
];
for
(
i
=
0
;
i
<
nb_levels
;
i
++
)
{
for
(
i
=
0
;
i
<
NB_LEVELS
;
i
++
)
{
int64_t
scale_v
=
scaling_v
[
i
];
int64_t
scale_v
=
scaling_v
[
i
];
int64_t
scale_h
=
scaling_h
[
i
];
int64_t
scale_h
=
scaling_h
[
i
];
scaled_width
<<=
1
;
scaled_width
<<=
1
;
...
@@ -578,7 +578,7 @@ static int decode_plane(AVCodecContext *avctx, int plane,
...
@@ -578,7 +578,7 @@ static int decode_plane(AVCodecContext *avctx, int plane,
ctx
->
band
[
plane
][
0
].
height
,
stride
);
ctx
->
band
[
plane
][
0
].
height
,
stride
);
reconstruction
(
avctx
,
(
int16_t
*
)
frame
->
data
[
plane
],
ctx
->
w
>>
shift
,
reconstruction
(
avctx
,
(
int16_t
*
)
frame
->
data
[
plane
],
ctx
->
w
>>
shift
,
ctx
->
h
>>
shift
,
stride
,
NB_LEVELS
,
ctx
->
scaling
[
plane
][
H
],
ctx
->
h
>>
shift
,
stride
,
ctx
->
scaling
[
plane
][
H
],
ctx
->
scaling
[
plane
][
V
]);
ctx
->
scaling
[
plane
][
V
]);
return
0
;
return
0
;
...
...
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