Browse Source

Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5'

* commit 'f5245a9c6206878b892adf3ccbccc9311c202af5':
  avconv: fix parsing the AVOptions for -target

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4
Michael Niedermayer 11 years ago
parent
commit
2082c00ea2
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      ffmpeg_opt.c

+ 4
- 0
ffmpeg_opt.c View 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); av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
return AVERROR(EINVAL); 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; return 0;
} }




Loading…
Cancel
Save