diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:58:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:58:53 +0200 |
| commit | 946a106995bca70a360f5bd03fa503e8beb09cc5 (patch) | |
| tree | 542522d8a65a234312cf51d0143cb9cbe0661d9e | |
| parent | fed28fe054de573643ae3fee50ad7ae09d78e738 (diff) | |
| parent | e1f0c41e1aa37a9c166c43abf1b526c796ed7649 (diff) | |
| download | ffmpeg-946a106995bca70a360f5bd03fa503e8beb09cc5.tar.gz | |
Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1
* commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649':
avconv: fix parsing the AVOptions for -target
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 06978c05e2..a8dacf1b71 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1940,6 +1940,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; } |