aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 20:16:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 20:31:56 +0100
commitf3abdf4392a146462dc679846c061b8bf2b5c7a0 (patch)
tree700ea1bb9efc0b2979b1a7b5c17b53b26cc8c5fe
parent8b3affda87e45165bd7d968a8cad82fe700f60b7 (diff)
downloadffmpeg-f3abdf4392a146462dc679846c061b8bf2b5c7a0.tar.gz
cmdutils: fix null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--cmdutils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 50a1ff8d72..3e0dfbce67 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -530,8 +530,8 @@ int opt_default(void *optctx, const char *opt, const char *arg)
#endif
#if CONFIG_AVRESAMPLE
rc_class = avresample_get_class();
- if (av_opt_find(&rc_class, opt, NULL, 0,
- AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) {
+ if ((o=av_opt_find(&rc_class, opt, NULL, 0,
+ AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
av_dict_set(&resample_opts, opt, arg, FLAGS);
consumed = 1;
}