Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
4401958f
Commit
4401958f
authored
12 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
motionpixels: Propagate errors in vlc table init
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
parent
e149127b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/motionpixels.c
+14
-7
14 additions, 7 deletions
libavcodec/motionpixels.c
with
14 additions
and
7 deletions
libavcodec/motionpixels.c
+
14
−
7
View file @
4401958f
...
...
@@ -101,38 +101,44 @@ static void mp_read_changes_map(MotionPixelsContext *mp, GetBitContext *gb, int
}
}
static
void
mp_get_code
(
MotionPixelsContext
*
mp
,
GetBitContext
*
gb
,
int
size
,
int
code
)
static
int
mp_get_code
(
MotionPixelsContext
*
mp
,
GetBitContext
*
gb
,
int
size
,
int
code
)
{
while
(
get_bits1
(
gb
))
{
++
size
;
if
(
size
>
mp
->
max_codes_bits
)
{
av_log
(
mp
->
avctx
,
AV_LOG_ERROR
,
"invalid code size %d/%d
\n
"
,
size
,
mp
->
max_codes_bits
);
return
;
return
AVERROR_INVALIDDATA
;
}
code
<<=
1
;
mp_get_code
(
mp
,
gb
,
size
,
code
+
1
);
if
(
mp_get_code
(
mp
,
gb
,
size
,
code
+
1
)
<
0
)
return
AVERROR_INVALIDDATA
;
}
if
(
mp
->
current_codes_count
>=
MAX_HUFF_CODES
)
{
av_log
(
mp
->
avctx
,
AV_LOG_ERROR
,
"too many codes
\n
"
);
return
;
return
AVERROR_INVALIDDATA
;
}
mp
->
codes
[
mp
->
current_codes_count
].
code
=
code
;
mp
->
codes
[
mp
->
current_codes_count
++
].
size
=
size
;
return
0
;
}
static
void
mp_read_codes_table
(
MotionPixelsContext
*
mp
,
GetBitContext
*
gb
)
static
int
mp_read_codes_table
(
MotionPixelsContext
*
mp
,
GetBitContext
*
gb
)
{
if
(
mp
->
codes_count
==
1
)
{
mp
->
codes
[
0
].
delta
=
get_bits
(
gb
,
4
);
}
else
{
int
i
;
int
ret
;
mp
->
max_codes_bits
=
get_bits
(
gb
,
4
);
for
(
i
=
0
;
i
<
mp
->
codes_count
;
++
i
)
mp
->
codes
[
i
].
delta
=
get_bits
(
gb
,
4
);
mp
->
current_codes_count
=
0
;
mp_get_code
(
mp
,
gb
,
0
,
0
);
if
((
ret
=
mp_get_code
(
mp
,
gb
,
0
,
0
))
<
0
)
return
ret
;
}
return
0
;
}
static
int
mp_gradient
(
MotionPixelsContext
*
mp
,
int
component
,
int
v
)
...
...
@@ -287,7 +293,8 @@ static int mp_decode_frame(AVCodecContext *avctx,
*
(
uint16_t
*
)
mp
->
frame
.
data
[
0
]
=
get_bits
(
&
gb
,
15
);
mp
->
changes_map
[
0
]
=
1
;
}
mp_read_codes_table
(
mp
,
&
gb
);
if
(
mp_read_codes_table
(
mp
,
&
gb
)
<
0
)
goto
end
;
sz
=
get_bits
(
&
gb
,
18
);
if
(
avctx
->
extradata
[
0
]
!=
5
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment