Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:52:34 +0000 (12:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 10:55:31 +0000 (12:55 +0200)
* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
  avconv: fix parsing the AVOptions for -target

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt.c

index 5bc7705..c5fd12f 100644 (file)
@@ -2301,6 +2301,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;
 }