[FFmpeg-cvslog] ffmpeg: use av_malloc_array()

[Clément Bœsch]

On Thu, May 01, 2014 at 02:30:10AM +0200, Michael Niedermayer wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 02:23:08 2014 +0200| [feaa31d35499395ec292015ce02e2a5494c8283e] | committer: Michael Niedermayer
> 
> ffmpeg: use av_malloc_array()
> 
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feaa31d35499395ec292015ce02e2a5494c8283e
> ---
> 
>  ffmpeg.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/ffmpeg.c b/ffmpeg.c
> index e7b4290..1237ba9 100644
> --- a/ffmpeg.c
> +++ b/ffmpeg.c
> @@ -2150,7 +2150,7 @@ static void print_sdp(void)
>  {
>      char sdp[16384];
>      int i;
> -    AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
> +    AVFormatContext **avc = av_malloc_array(sizeof(*avc), nb_output_files);
>  

It shouldn't change anything, but the prototype is av_malloc_array(size_t
nmemb, size_t size), so strictly speaking these args should be swapped.

>      if (!avc)
>          exit_program(1);
> @@ -2285,7 +2285,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
>          if (*p == ',')
>              n++;
>      size = n;
> -    pts = av_malloc(sizeof(*pts) * size);
> +    pts = av_malloc_array(sizeof(*pts), size);

ditto

>      if (!pts) {
>          av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
>          exit_program(1);
> 

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20140501/03950f0d/attachment.asc>