RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_mux_init: return error codes from parse_forced_key_frames() instead of aborting

This commit is contained in:
Anton Khirnov 2023-07-12 16:40:19 +02:00
parent 6691d131d8
commit 4e3557aadb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fftools/ffmpeg_mux_init.c
View File

@ -2245,8 +2245,8 @@ static int compare_int64(const void *a, const void *b)
return FFDIFFSIGN(*(const int64_t *)a, *(const int64_t *)b); return FFDIFFSIGN(*(const int64_t *)a, *(const int64_t *)b);
} }
static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux, static int parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
const char *spec) const char *spec)
{ {
const char *p; const char *p;
int n = 1, i, size, index = 0; int n = 1, i, size, index = 0;
@ -2258,7 +2258,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
size = n; size = n;
pts = av_malloc_array(size, sizeof(*pts)); pts = av_malloc_array(size, sizeof(*pts));
if (!pts) if (!pts)
report_and_exit(AVERROR(ENOMEM)); return AVERROR(ENOMEM);
p = spec; p = spec;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -2275,7 +2275,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
if (nb_ch > INT_MAX - size || if (nb_ch > INT_MAX - size ||
!(pts = av_realloc_f(pts, size += nb_ch - 1, !(pts = av_realloc_f(pts, size += nb_ch - 1,
sizeof(*pts)))) sizeof(*pts))))
report_and_exit(AVERROR(ENOMEM)); return AVERROR(ENOMEM);
t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0; t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0;
for (j = 0; j < nb_ch; j++) { for (j = 0; j < nb_ch; j++) {
@ -2297,6 +2297,8 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux,
qsort(pts, size, sizeof(*pts), compare_int64); qsort(pts, size, sizeof(*pts), compare_int64);
kf->nb_pts = size; kf->nb_pts = size;
kf->pts = pts; kf->pts = pts;
return 0;
} }
static int process_forced_keyframes(Muxer *mux, const OptionsContext *o) static int process_forced_keyframes(Muxer *mux, const OptionsContext *o)
@ -2331,7 +2333,9 @@ static int process_forced_keyframes(Muxer *mux, const OptionsContext *o)
} else if (!strcmp(forced_keyframes, "source_no_drop")) { } else if (!strcmp(forced_keyframes, "source_no_drop")) {
ost->kf.type = KF_FORCE_SOURCE_NO_DROP; ost->kf.type = KF_FORCE_SOURCE_NO_DROP;
} else { } else {
parse_forced_key_frames(&ost->kf, mux, forced_keyframes); int ret = parse_forced_key_frames(&ost->kf, mux, forced_keyframes);
if (ret < 0)
return ret;
} }
} }