diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 12:05:02 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 12:05:02 +0200 |
commit | 92424a45d0c3154ad83aaba6e0fb8dbb17d8d1a4 (patch) | |
tree | 57bfa4eb5592ef1950b1fd733de4c8ee4c02c15a /libavutil/mem.c | |
parent | bcd1c2061211c7a4126db241229c5ecb71e05f80 (diff) | |
parent | b634b36fcebfe16b837b6c4044f5d5cb99a75040 (diff) |
Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'
* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
mem: Improve documentation wording and spelling
Conflicts:
libavutil/mem.c
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mem.c')
-rw-r--r-- | libavutil/mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/mem.c b/libavutil/mem.c index 20dfd629a8..2d468ce362 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -77,7 +77,7 @@ void *av_malloc(size_t size) long diff; #endif - /* let's disallow possible ambiguous cases */ + /* let's disallow possibly ambiguous cases */ if (size > (max_alloc_size - 32)) return NULL; @@ -144,7 +144,7 @@ void *av_realloc(void *ptr, size_t size) int diff; #endif - /* let's disallow possible ambiguous cases */ + /* let's disallow possibly ambiguous cases */ if (size > (max_alloc_size - 32)) return NULL; |