From 4f6a1c974ff69afa5b40ced0c9e39c90da73235a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 30 Apr 2012 22:48:42 +0200 Subject: [PATCH] Fix parsing of -force_key_frames option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently it always exits with an error when more than one position is specified. Fixes trac issue #1266. Signed-off-by: Reimar Döffinger --- ffmpeg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index abceb3f50e..37817ccef4 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -4380,9 +4380,12 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost) av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n"); exit_program(1); } + p = kf; for (i = 0; i < n; i++) { - p = i ? strchr(p, ',') + 1 : kf; + char *next = strchr(p, ','); + if (next) *next++ = 0; ost->forced_kf_pts[i] = parse_time_or_die("force_key_frames", p, 1); + p = next; } }