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
3feb3d6c
Commit
3feb3d6c
authored
Sep 15, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mem: Introduce av_reallocp
parent
187105ff
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
1 deletion
+39
-1
APIchanges
doc/APIchanges
+3
-0
mem.c
libavutil/mem.c
+16
-0
mem.h
libavutil/mem.h
+19
-0
version.h
libavutil/version.h
+1
-1
No files found.
doc/APIchanges
View file @
3feb3d6c
...
...
@@ -13,6 +13,9 @@ libavutil: 2012-10-22
API changes, most recent first:
2013-09-xx - xxxxxxx - lavu 52.13.0 - mem.h
Add av_reallocp.
2013-08-xx - xxxxxxx - lavc 55.16.0 - avcodec.h
Extend AVPacket API with av_packet_unref, av_packet_ref,
av_packet_move_ref, av_packet_copy_props, av_packet_free_side_data.
...
...
libavutil/mem.c
View file @
3feb3d6c
...
...
@@ -136,6 +136,22 @@ void *av_realloc(void *ptr, size_t size)
#endif
}
int
av_reallocp
(
void
*
ptr
,
size_t
size
)
{
void
**
ptrptr
=
ptr
;
void
*
ret
;
ret
=
av_realloc
(
*
ptrptr
,
size
);
if
(
!
ret
)
{
av_freep
(
ptr
);
return
AVERROR
(
ENOMEM
);
}
*
ptrptr
=
ret
;
return
0
;
}
void
*
av_realloc_array
(
void
*
ptr
,
size_t
nmemb
,
size_t
size
)
{
if
(
!
size
||
nmemb
>=
INT_MAX
/
size
)
...
...
libavutil/mem.h
View file @
3feb3d6c
...
...
@@ -116,6 +116,25 @@ av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t siz
*/
void
*
av_realloc
(
void
*
ptr
,
size_t
size
)
av_alloc_size
(
2
);
/**
* Allocate or reallocate a block of memory.
* If *ptr is NULL and size > 0, allocate a new block. If
* size is zero, free the memory block pointed to by ptr.
* @param ptr Pointer to a pointer to a memory block already allocated
* with av_realloc(), or pointer to a pointer to NULL.
* The pointer is updated on success, or freed on failure.
* @param size Size in bytes for the memory block to be allocated or
* reallocated
* @return Zero on success, an AVERROR error code on failure.
* @warning Pointers originating from the av_malloc() family of functions must
* not be passed to av_reallocp(). The former can be implemented using
* memalign() (or other functions), and there is no guarantee that
* pointers from such functions can be passed to realloc() at all.
* The situation is undefined according to POSIX and may crash with
* some libc implementations.
*/
int
av_reallocp
(
void
*
ptr
,
size_t
size
);
/**
* Allocate or reallocate an array.
* If ptr is NULL and nmemb > 0, allocate a new block. If
...
...
libavutil/version.h
View file @
3feb3d6c
...
...
@@ -37,7 +37,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 1
4
#define LIBAVUTIL_VERSION_MINOR 1
5
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
...
...
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