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
42df71d9
Commit
42df71d9
authored
May 31, 2015
by
Vittorio Giovara
Committed by
Luca Barbato
May 31, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ratecontrol: Check memory allocation
parent
0994e142
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
1 deletion
+10
-1
ratecontrol.c
libavcodec/ratecontrol.c
+10
-1
No files found.
libavcodec/ratecontrol.c
View file @
42df71d9
...
@@ -163,6 +163,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
...
@@ -163,6 +163,8 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
return
-
1
;
return
-
1
;
rcc
->
entry
=
av_mallocz
(
i
*
sizeof
(
RateControlEntry
));
rcc
->
entry
=
av_mallocz
(
i
*
sizeof
(
RateControlEntry
));
rcc
->
num_entries
=
i
;
rcc
->
num_entries
=
i
;
if
(
!
rcc
->
entry
)
return
AVERROR
(
ENOMEM
);
/* init all to skipped p frames
/* init all to skipped p frames
* (with b frames we might have a not encoded frame at the end FIXME) */
* (with b frames we might have a not encoded frame at the end FIXME) */
...
@@ -210,8 +212,10 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
...
@@ -210,8 +212,10 @@ av_cold int ff_rate_control_init(MpegEncContext *s)
p
=
next
;
p
=
next
;
}
}
if
(
init_pass2
(
s
)
<
0
)
if
(
init_pass2
(
s
)
<
0
)
{
ff_rate_control_uninit
(
s
);
return
-
1
;
return
-
1
;
}
// FIXME maybe move to end
// FIXME maybe move to end
if
((
s
->
avctx
->
flags
&
CODEC_FLAG_PASS2
)
&&
s
->
avctx
->
rc_strategy
==
FF_RC_STRATEGY_XVID
)
{
if
((
s
->
avctx
->
flags
&
CODEC_FLAG_PASS2
)
&&
s
->
avctx
->
rc_strategy
==
FF_RC_STRATEGY_XVID
)
{
...
@@ -932,6 +936,11 @@ static int init_pass2(MpegEncContext *s)
...
@@ -932,6 +936,11 @@ static int init_pass2(MpegEncContext *s)
qscale
=
av_malloc
(
sizeof
(
double
)
*
rcc
->
num_entries
);
qscale
=
av_malloc
(
sizeof
(
double
)
*
rcc
->
num_entries
);
blurred_qscale
=
av_malloc
(
sizeof
(
double
)
*
rcc
->
num_entries
);
blurred_qscale
=
av_malloc
(
sizeof
(
double
)
*
rcc
->
num_entries
);
if
(
!
qscale
||
!
blurred_qscale
)
{
av_free
(
qscale
);
av_free
(
blurred_qscale
);
return
AVERROR
(
ENOMEM
);
}
toobig
=
0
;
toobig
=
0
;
for
(
step
=
256
*
256
;
step
>
0
.
0000001
;
step
*=
0
.
5
)
{
for
(
step
=
256
*
256
;
step
>
0
.
0000001
;
step
*=
0
.
5
)
{
...
...
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