| Message ID | AM7PR03MB6660396F423B4008B2115D1A8FF79@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 21c7df0d22dc83b748659cb3068729944ff57095 |
| Headers | show |
| Series | [FFmpeg-devel] avutil/mem: Correct av_calloc() documentation | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
Andreas Rheinhardt: > Incorrect since 4959f18a8e11ad7d3529b1c4fc429f1b6b76ad7c. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > Do we even need both av_mallocz_array and av_calloc given that > they do exactly the same? I'd like to deprecate one, namely > av_mallocz_array() (it has the longer name). > > libavutil/mem.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavutil/mem.h b/libavutil/mem.h > index e9d343eaf0..c7f8867a13 100644 > --- a/libavutil/mem.h > +++ b/libavutil/mem.h > @@ -240,7 +240,7 @@ av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size); > av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size); > > /** > - * Non-inlined equivalent of av_mallocz_array(). > + * Equivalent of av_mallocz_array(). > * > * Created for symmetry with the calloc() C function. > */ > Will apply later today unless there are objections. I'm still waiting for input regarding the deprecation of av_calloc or av_mallocz_array. - Andreas
diff --git a/libavutil/mem.h b/libavutil/mem.h index e9d343eaf0..c7f8867a13 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -240,7 +240,7 @@ av_alloc_size(1, 2) void *av_malloc_array(size_t nmemb, size_t size); av_alloc_size(1, 2) void *av_mallocz_array(size_t nmemb, size_t size); /** - * Non-inlined equivalent of av_mallocz_array(). + * Equivalent of av_mallocz_array(). * * Created for symmetry with the calloc() C function. */
Incorrect since 4959f18a8e11ad7d3529b1c4fc429f1b6b76ad7c. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- Do we even need both av_mallocz_array and av_calloc given that they do exactly the same? I'd like to deprecate one, namely av_mallocz_array() (it has the longer name). libavutil/mem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)