Patch by Brian Brice bbrice at newtek dot com
Originally committed as revision 6945 to svn://svn.ffmpeg.org/ffmpeg/trunk
DVMuxContext* dv_init_mux(AVFormatContext* s)
{
- DVMuxContext *c;
+ DVMuxContext *c = (DVMuxContext *)s->priv_data;
AVStream *vst = NULL;
int i;
if (s->nb_streams > 3)
return NULL;
- c = av_mallocz(sizeof(DVMuxContext));
- if (!c)
- return NULL;
-
c->n_ast = 0;
c->ast[0] = c->ast[1] = NULL;
return c;
bail_out:
- av_free(c);
return NULL;
}
#ifdef CONFIG_MUXERS
static int dv_write_header(AVFormatContext *s)
{
- s->priv_data = dv_init_mux(s);
- if (!s->priv_data) {
+ if (!dv_init_mux(s)) {
av_log(s, AV_LOG_ERROR, "Can't initialize DV format!\n"
"Make sure that you supply exactly two streams:\n"
" video: 25fps or 29.97fps, audio: 2ch/48Khz/PCM\n"