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
b62ed56e
Commit
b62ed56e
authored
Apr 11, 2016
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/shorten: properly handle bitshift > 31
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
15fa0178
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
shorten.c
libavcodec/shorten.c
+7
-3
No files found.
libavcodec/shorten.c
View file @
b62ed56e
...
...
@@ -164,9 +164,13 @@ static void fix_bitshift(ShortenContext *s, int32_t *buffer)
{
int
i
;
if
(
s
->
bitshift
!=
0
)
if
(
s
->
bitshift
==
32
)
{
for
(
i
=
0
;
i
<
s
->
blocksize
;
i
++
)
buffer
[
i
]
=
0
;
}
else
if
(
s
->
bitshift
!=
0
)
{
for
(
i
=
0
;
i
<
s
->
blocksize
;
i
++
)
buffer
[
i
]
<<=
s
->
bitshift
;
}
}
static
int
init_offset
(
ShortenContext
*
s
)
...
...
@@ -602,7 +606,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
break
;
case
FN_BITSHIFT
:
{
unsigned
bitshift
=
get_ur_golomb_shorten
(
&
s
->
gb
,
BITSHIFTSIZE
);
if
(
bitshift
>
3
1
)
{
if
(
bitshift
>
3
2
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"bitshift %d is invalid
\n
"
,
bitshift
);
return
AVERROR_INVALIDDATA
;
...
...
@@ -680,7 +684,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
if
(
s
->
version
<
2
)
s
->
offset
[
channel
][
s
->
nmean
-
1
]
=
sum
/
s
->
blocksize
;
else
s
->
offset
[
channel
][
s
->
nmean
-
1
]
=
(
sum
/
s
->
blocksize
)
<<
s
->
bitshift
;
s
->
offset
[
channel
][
s
->
nmean
-
1
]
=
s
->
bitshift
==
32
?
0
:
(
sum
/
s
->
blocksize
)
<<
s
->
bitshift
;
}
/* copy wrap samples for use with next block */
...
...
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