Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
a03caa38
Commit
a03caa38
authored
Nov 07, 2020
by
Andreas Rheinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/hqx: Inline constants
Signed-off-by:
Andreas Rheinhardt
<
andreas.rheinhardt@gmail.com
>
parent
b1af617f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
hqx.c
libavcodec/hqx.c
+2
-2
hqx.h
libavcodec/hqx.h
+1
-0
hqxvlc.c
libavcodec/hqxvlc.c
+1
-1
No files found.
libavcodec/hqx.c
View file @
a03caa38
...
...
@@ -197,7 +197,7 @@ static int hqx_decode_422a(HQXContext *ctx, int slice_no, int x, int y)
int
i
,
ret
;
int
cbp
;
cbp
=
get_vlc2
(
gb
,
ctx
->
cbp_vlc
.
table
,
ctx
->
cbp_vlc
.
bits
,
1
);
cbp
=
get_vlc2
(
gb
,
ctx
->
cbp_vlc
.
table
,
HQX_CBP_VLC_BITS
,
1
);
for
(
i
=
0
;
i
<
12
;
i
++
)
memset
(
slice
->
block
[
i
],
0
,
sizeof
(
**
slice
->
block
)
*
64
);
...
...
@@ -283,7 +283,7 @@ static int hqx_decode_444a(HQXContext *ctx, int slice_no, int x, int y)
int
i
,
ret
;
int
cbp
;
cbp
=
get_vlc2
(
gb
,
ctx
->
cbp_vlc
.
table
,
ctx
->
cbp_vlc
.
bits
,
1
);
cbp
=
get_vlc2
(
gb
,
ctx
->
cbp_vlc
.
table
,
HQX_CBP_VLC_BITS
,
1
);
for
(
i
=
0
;
i
<
16
;
i
++
)
memset
(
slice
->
block
[
i
],
0
,
sizeof
(
**
slice
->
block
)
*
64
);
...
...
libavcodec/hqx.h
View file @
a03caa38
...
...
@@ -77,6 +77,7 @@ typedef struct HQXContext {
VLC
dc_vlc
[
3
];
}
HQXContext
;
#define HQX_CBP_VLC_BITS 5
#define HQX_DC_VLC_BITS 9
extern
const
HQXAC
ff_hqx_ac
[
NUM_HQX_AC
];
...
...
libavcodec/hqxvlc.c
View file @
a03caa38
...
...
@@ -2150,7 +2150,7 @@ const HQXAC ff_hqx_ac[NUM_HQX_AC] = {
av_cold int ff_hqx_init_vlcs(HQXContext *ctx)
{
int ret = init_vlc(&ctx->cbp_vlc,
5
, FF_ARRAY_ELEMS(cbp_vlc_lens),
int ret = init_vlc(&ctx->cbp_vlc,
HQX_CBP_VLC_BITS
, FF_ARRAY_ELEMS(cbp_vlc_lens),
cbp_vlc_lens, 1, 1, cbp_vlc_bits, 1, 1, 0);
if (ret < 0)
return ret;
...
...
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