From 20a8dca57fc579dbb0641ccd6dec2686d0ffdf1b Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Sat, 30 Jun 2012 12:09:24 +0200
Subject: [PATCH] ffmpeg: fix parsing of -force_key_frames option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Identical to commit 4f6a1c9 by Reimar Döffinger,
that was lost after the merge of 19ad567.
---
 ffmpeg.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index e3ed179b80..dea93e528e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2792,10 +2792,13 @@ 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;
         t = parse_time_or_die("force_key_frames", p, 1);
         ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
+        p = next;
     }
 }