RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f5245a9c6206878b892adf3ccbccc9311c202af5' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-27 12:52:34 +02:00
parent ad207f1119 f5245a9c62
commit 2082c00ea2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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);
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;
}