diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 16:29:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 16:29:23 +0400 |
| commit | 4b6e46c4277ec46041840ed4873d5658a2fd897e (patch) | |
| tree | 70e5806c38f3f78be2cd7020add41b6ad2428048 /ffmpeg_opt.c | |
| parent | 516ba41f05c8a0e4054d2a858e2951a6091c4811 (diff) | |
| parent | f7395926f204051af9ad459a6d876b96ee6179ee (diff) | |
Merge commit 'f7395926f204051af9ad459a6d876b96ee6179ee' into release/2.2
* commit 'f7395926f204051af9ad459a6d876b96ee6179ee':
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 c09675ce68..f1fff795d8 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -2233,6 +2233,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; } |