Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-08-26 10:26:35 +0400
committerAnton Khirnov <anton@khirnov.net>2014-08-27 10:37:00 +0400
commite1f0c41e1aa37a9c166c43abf1b526c796ed7649 (patch)
tree50b52511a094272d59b7656820f013a6f5c98ff2
parent8d7839fc7c52574dfc22db0181b1cef9cb929910 (diff)
avconv: fix parsing the AVOptions for -target
CC: libav-stable@libav.org (cherry picked from commit f5245a9c6206878b892adf3ccbccc9311c202af5) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit f7395926f204051af9ad459a6d876b96ee6179ee) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--avconv_opt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index 8f7fb3a150..3c82657a58 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1633,6 +1633,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;
}