Commit 2082c00e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f5245a9c'

* commit 'f5245a9c':
  avconv: fix parsing the AVOptions for -target
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ad207f11 f5245a9c
......@@ -2301,6 +2301,10 @@ static int opt_target(void *optctx, const char *opt, const char *arg)
av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
return AVERROR(EINVAL);
}
av_dict_copy(&o->g->codec_opts, codec_opts, 0);
av_dict_copy(&o->g->format_opts, format_opts, 0);
return 0;
}
......
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