[Ffmpeg-cvslog] r7428 - trunk/libavformat/utils.c

[bcoudurier]

Author: bcoudurier
Date: Mon Jan  8 15:22:00 2007
New Revision: 7428

Modified:
   trunk/libavformat/utils.c

Log:
10l, only allocate priv_data if not already done

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Mon Jan  8 15:22:00 2007
@@ -2184,12 +2184,11 @@
         }
     }
 
-    if (s->oformat->priv_data_size > 0) {
+    if (!s->priv_data && s->oformat->priv_data_size > 0) {
         s->priv_data = av_mallocz(s->oformat->priv_data_size);
         if (!s->priv_data)
             return AVERROR_NOMEM;
-    } else
-        s->priv_data = NULL;
+    }
 
     if(s->oformat->write_header){
         ret = s->oformat->write_header(s);