diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2012-06-30 12:09:24 +0200 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-30 13:49:43 +0200 |
commit | 20a8dca57fc579dbb0641ccd6dec2686d0ffdf1b (patch) | |
tree | cbb71bb6979b55fcb661678b697939432e21063a | |
parent | ca612a27ae11c653367ee2438fcb7d99d3efafb3 (diff) | |
download | ffmpeg-20a8dca57fc579dbb0641ccd6dec2686d0ffdf1b.tar.gz |
ffmpeg: fix parsing of -force_key_frames option.
Identical to commit 4f6a1c9 by Reimar Döffinger,
that was lost after the merge of 19ad567.
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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; } } |