Fix parsing of -force_key_frames option.

Currently it always exits with an error when more than
one position is specified.
Fixes trac issue #1266.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
pull/30/merge
Reimar Döffinger 13 years ago
parent 5f161c2357
commit 4f6a1c974f
  1. 5
      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"); av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
exit_program(1); exit_program(1);
} }
p = kf;
for (i = 0; i < n; i++) { 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); ost->forced_kf_pts[i] = parse_time_or_die("force_key_frames", p, 1);
p = next;
} }
} }

Loading…
Cancel
Save