Commit f1903ab9 authored by bcoudurier's avatar bcoudurier

10l, only allocate priv_data if not already done

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7428 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent c0d7db8d
...@@ -2184,12 +2184,11 @@ int av_write_header(AVFormatContext *s) ...@@ -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); s->priv_data = av_mallocz(s->oformat->priv_data_size);
if (!s->priv_data) if (!s->priv_data)
return AVERROR_NOMEM; return AVERROR_NOMEM;
} else }
s->priv_data = NULL;
if(s->oformat->write_header){ if(s->oformat->write_header){
ret = s->oformat->write_header(s); ret = s->oformat->write_header(s);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment