Module: libav Branch: master Commit: 9294f538e924dcb8f3938e4e3476340f1e5b552f
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Fri Apr 6 22:36:16 2012 +0300 rtsp: Don't use av_malloc(0) if there are no streams Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/rtspdec.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 9306384..063e825 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -159,8 +159,9 @@ static int rtsp_read_header(AVFormatContext *s) if (ret) return ret; - rt->real_setup_cache = av_mallocz(2 * s->nb_streams * sizeof(*rt->real_setup_cache)); - if (!rt->real_setup_cache) + rt->real_setup_cache = !s->nb_streams ? NULL : + av_mallocz(2 * s->nb_streams * sizeof(*rt->real_setup_cache)); + if (!rt->real_setup_cache && s->nb_streams) return AVERROR(ENOMEM); rt->real_setup = rt->real_setup_cache + s->nb_streams; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
