diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-11-06 13:18:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-06 20:38:03 +0100 |
| commit | fc7b6d55741a926896958939a97b2958df1c1bb4 (patch) | |
| tree | eecca1195f49db30ba504fd92e286e9426d2678b | |
| parent | 84c27c8c082b320ea518b48c842a6e419c5c5d89 (diff) | |
| download | ffmpeg-streaming-fc7b6d55741a926896958939a97b2958df1c1bb4.zip ffmpeg-streaming-fc7b6d55741a926896958939a97b2958df1c1bb4.tar.gz | |
fftools/ffmpeg_opt: Fix mixed declarations and code
Introduced in ed3c317d.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | fftools/ffmpeg_opt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index af9a9a6..71063cc 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3007,10 +3007,11 @@ static int opt_preset(void *optctx, const char *opt, const char *arg) static int opt_old2new(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; + int ret; char *s = av_asprintf("%s:%c", opt + 1, *opt); if (!s) return AVERROR(ENOMEM); - int ret = parse_option(o, s, arg, options); + ret = parse_option(o, s, arg, options); av_free(s); return ret; } @@ -3087,10 +3088,11 @@ static int opt_vsync(void *optctx, const char *opt, const char *arg) static int opt_timecode(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; + int ret; char *tcr = av_asprintf("timecode=%s", arg); if (!tcr) return AVERROR(ENOMEM); - int ret = parse_option(o, "metadata:g", tcr, options); + ret = parse_option(o, "metadata:g", tcr, options); if (ret >= 0) ret = av_dict_set(&o->g->codec_opts, "gop_timecode", arg, 0); av_free(tcr); |
