[FFmpeg-cvslog] avparser: don't av_malloc(0).

Ronald S. Bultje git at videolan.org
Thu Apr 28 04:28:30 CEST 2011


ffmpeg | branch: master | Ronald S. Bultje <rbultje at google.com> | Tue Apr 26 18:46:08 2011 -0700| [5eef4afb9a5c637229469036285fa9a334f6f7d4] | committer: Ronald S. Bultje

avparser: don't av_malloc(0).

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eef4afb9a5c637229469036285fa9a334f6f7d4
---

 libavcodec/parser.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

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



More information about the ffmpeg-cvslog mailing list