From 191e08d113ef1d089c45c5fb6c95491e16dde86e Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 26 Apr 2011 18:46:08 -0700 Subject: avparser: don't av_malloc(0). Signed-off-by: Michael Niedermayer --- libavcodec/parser.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libavcodec/parser.c') diff --git a/libavcodec/parser.c b/libavcodec/parser.c index c1c8ce22ca..b5c34dfb76 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -58,10 +58,12 @@ AVCodecParserContext *av_parser_init(int codec_id) if (!s) return NULL; s->parser = parser; - s->priv_data = av_mallocz(parser->priv_data_size); - if (!s->priv_data) { - av_free(s); - return NULL; + if (parser->priv_data_size) { + s->priv_data = av_mallocz(parser->priv_data_size); + if (!s->priv_data) { + av_free(s); + return NULL; + } } if (parser->parser_init) { ret = parser->parser_init(s); -- cgit v1.2.3