Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
> ---
> This also removes the last user of av_size_mult from libavformat
> (indeed, from anything outside of mem.c), so this removes one entry
> from the list of dynamic symbols (if using a shared build).
>
> libavformat/oggdec.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
> index bb289e0756..5afbae2147 100644
> --- a/libavformat/oggdec.c
> +++ b/libavformat/oggdec.c
> @@ -251,7 +251,6 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t
> serial)
> int idx = ogg->nstreams;
> AVStream *st;
> struct ogg_stream *os;
> - size_t size;
>
> if (ogg->state) {
> av_log(s, AV_LOG_ERROR, "New streams are not supposed to be added "
> @@ -260,8 +259,8 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t
> serial)
> }
>
> /* Allocate and init a new Ogg Stream */
> - if (av_size_mult(ogg->nstreams + 1, sizeof(*ogg->streams), &size) < 0 ||
> - !(os = av_realloc(ogg->streams, size)))
> + if (!(os = av_realloc_array(ogg->streams, ogg->nstreams + 1,
> + sizeof(*ogg->streams))))
> return AVERROR(ENOMEM);
> ogg->streams = os;
> os = ogg->streams + idx;
>
Will apply this patchset later today unless there are objections.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
