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
e002e329
Commit
e002e329
authored
Oct 11, 2012
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the new aes/md5/sha/tree allocation functions
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
9a92aea2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
flacenc.c
libavcodec/flacenc.c
+1
-1
crypto.c
libavformat/crypto.c
+1
-1
httpauth.c
libavformat/httpauth.c
+1
-1
mxfdec.c
libavformat/mxfdec.c
+1
-1
nut.c
libavformat/nut.c
+1
-1
rtmpproto.c
libavformat/rtmpproto.c
+1
-1
tree.c
libavutil/tree.c
+1
-1
No files found.
libavcodec/flacenc.c
View file @
e002e329
...
...
@@ -354,7 +354,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
s
->
channels
,
16
);
/* initialize MD5 context */
s
->
md5ctx
=
av_m
alloc
(
av_md5_size
);
s
->
md5ctx
=
av_m
d5_alloc
(
);
if
(
!
s
->
md5ctx
)
return
AVERROR
(
ENOMEM
);
av_md5_init
(
s
->
md5ctx
);
...
...
libavformat/crypto.c
View file @
e002e329
...
...
@@ -87,7 +87,7 @@ static int crypto_open(URLContext *h, const char *uri, int flags)
av_log
(
h
,
AV_LOG_ERROR
,
"Unable to open input
\n
"
);
goto
err
;
}
c
->
aes
=
av_
mallocz
(
av_aes_size
);
c
->
aes
=
av_
aes_alloc
(
);
if
(
!
c
->
aes
)
{
ret
=
AVERROR
(
ENOMEM
);
goto
err
;
...
...
libavformat/httpauth.c
View file @
e002e329
...
...
@@ -159,7 +159,7 @@ static char *make_digest_auth(HTTPAuthState *state, const char *username,
ff_data_to_hex
(
cnonce
,
(
const
uint8_t
*
)
cnonce_buf
,
sizeof
(
cnonce_buf
),
1
);
cnonce
[
2
*
sizeof
(
cnonce_buf
)]
=
0
;
md5ctx
=
av_m
alloc
(
av_md5_size
);
md5ctx
=
av_m
d5_alloc
(
);
if
(
!
md5ctx
)
return
NULL
;
...
...
libavformat/mxfdec.c
View file @
e002e329
...
...
@@ -340,7 +340,7 @@ static int mxf_decrypt_triplet(AVFormatContext *s, AVPacket *pkt, KLVPacket *klv
int
index
;
if
(
!
mxf
->
aesc
&&
s
->
key
&&
s
->
keylen
==
16
)
{
mxf
->
aesc
=
av_
malloc
(
av_aes_size
);
mxf
->
aesc
=
av_
aes_alloc
(
);
if
(
!
mxf
->
aesc
)
return
AVERROR
(
ENOMEM
);
av_aes_init
(
mxf
->
aesc
,
s
->
key
,
128
,
1
);
...
...
libavformat/nut.c
View file @
e002e329
...
...
@@ -116,7 +116,7 @@ int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b){
void
ff_nut_add_sp
(
NUTContext
*
nut
,
int64_t
pos
,
int64_t
back_ptr
,
int64_t
ts
){
Syncpoint
*
sp
=
av_mallocz
(
sizeof
(
Syncpoint
));
struct
AVTreeNode
*
node
=
av_mallocz
(
av_tree_node_size
);
struct
AVTreeNode
*
node
=
av_tree_node_alloc
(
);
sp
->
pos
=
pos
;
sp
->
back_ptr
=
back_ptr
;
...
...
libavformat/rtmpproto.c
View file @
e002e329
...
...
@@ -859,7 +859,7 @@ int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap,
uint8_t
hmac_buf
[
64
+
32
]
=
{
0
};
int
i
;
sha
=
av_
mallocz
(
av_sha_size
);
sha
=
av_
sha_alloc
(
);
if
(
!
sha
)
return
AVERROR
(
ENOMEM
);
...
...
libavutil/tree.c
View file @
e002e329
...
...
@@ -220,7 +220,7 @@ int main (void)
}
av_log
(
NULL
,
AV_LOG_ERROR
,
"inserting %4d
\n
"
,
j
);
if
(
!
node
)
node
=
av_
mallocz
(
av_tree_node_size
);
node
=
av_
tree_node_alloc
(
);
av_tree_insert
(
&
root
,
(
void
*
)
(
j
+
1
),
cmp
,
&
node
);
j
=
av_lfg_get
(
&
prng
)
%
86294
;
...
...
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