Commit 8fae2df5 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

10l, only allocate priv_data if not already done

Originally committed as revision 7428 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c6efa4b5
......@@ -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);
......
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