From 5eef4afb9a5c637229469036285fa9a334f6f7d4 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@google.com>
Date: Tue, 26 Apr 2011 18:46:08 -0700
Subject: [PATCH] avparser: don't av_malloc(0).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
 libavcodec/parser.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index d5b85c3e4e..4b3d30e51a 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);