projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c46855
)
avconv: fix parsing the AVOptions for -target
author
Anton Khirnov
<anton@khirnov.net>
Tue, 26 Aug 2014 06:26:35 +0000
(06:26 +0000)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 27 Aug 2014 06:25:26 +0000
(06:25 +0000)
CC: libav-stable@libav.org
(cherry picked from commit
f5245a9c6206878b892adf3ccbccc9311c202af5
)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
avconv_opt.c
patch
|
blob
|
history
diff --git
a/avconv_opt.c
b/avconv_opt.c
index
33ac290
..
2d06912
100644
(file)
--- a/
avconv_opt.c
+++ b/
avconv_opt.c
@@
-1870,6
+1870,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;
}