[SCM] libav/experimental: 10l, only allocate priv_data if not already done

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8fae2df5e847e2998e4bfe6d91b35c6768991b84
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Jan 8 14:22:00 2007 +0000

    10l, only allocate priv_data if not already done
    
    Originally committed as revision 7428 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index a4c8b6f..ab64bfc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2184,12 +2184,11 @@ int av_write_header(AVFormatContext *s)
         }
     }
 
-    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);

-- 
Libav/FFmpeg packaging