diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:52:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:55:31 +0200 |
| commit | 2082c00ea2ed13a2a85d45a024bdc0beb3f18aff (patch) | |
| tree | 9aadc05e255f5c494eb486a93b2f535ea883d9cb /ffmpeg_opt.c | |
| parent | ad207f1119d961bb83177765226ee8f3b80e369f (diff) | |
| parent | f5245a9c6206878b892adf3ccbccc9311c202af5 (diff) | |
Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 5bc7705fdd..c5fd12ffab 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -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; } |