Avoid accessing the muxer context directly, as this will become
forbidden in future commits.
---
fftools/ffmpeg.c | 15 +++++++++------
fftools/ffmpeg.h | 2 ++
fftools/ffmpeg_mux.c | 7 +++++++
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index dfd57d2d03..b9ecbf4739 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2915,12 +2915,15 @@ static void parse_forced_key_frames(char *kf,
OutputStream *ost,
*next++ = 0;
if (!memcmp(p, "chapters", 8)) {
-
- AVFormatContext *avf = output_files[ost->file_index]->ctx;
+ OutputFile *of = output_files[ost->file_index];
+ AVChapter * const *ch;
+ unsigned int nb_ch;
int j;
- if (avf->nb_chapters > INT_MAX - size ||
- !(pts = av_realloc_f(pts, size += avf->nb_chapters - 1,
+ ch = of_get_chapters(of, &nb_ch);
+
+ if (nb_ch > INT_MAX - size ||
+ !(pts = av_realloc_f(pts, size += nb_ch - 1,
sizeof(*pts)))) {
av_log(NULL, AV_LOG_FATAL,
"Could not allocate forced key frames array.\n");
@@ -2929,8 +2932,8 @@ static void parse_forced_key_frames(char *kf,
OutputStream *ost,
t = p[8] ? parse_time_or_die("force_key_frames", p + 8, 1) : 0;
t = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base);
- for (j = 0; j < avf->nb_chapters; j++) {
- AVChapter *c = avf->chapters[j];
+ for (j = 0; j < nb_ch; j++) {
+ const AVChapter *c = ch[j];
av_assert1(index < size);
pts[index++] = av_rescale_q(c->start, c->time_base,
avctx->time_base) + t;
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index ec0d454fcc..8e34ae0702 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -700,5 +700,7 @@ void of_write_packet(OutputFile *of, AVPacket *pkt,
OutputStream *ost,
int unqueue);
int of_finished(OutputFile *of);
int64_t of_filesize(OutputFile *of);
+AVChapter * const *
+of_get_chapters(OutputFile *of, unsigned int *nb_chapters);
#endif /* FFTOOLS_FFMPEG_H */
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 927d9228b7..9dd5e8b076 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -395,3 +395,10 @@ int64_t of_filesize(OutputFile *of)
return ret;
}
+
+AVChapter * const *
+of_get_chapters(OutputFile *of, unsigned int *nb_chapters)
+{
+ *nb_chapters = of->ctx->nb_chapters;
+ return of->ctx->chapters;
+}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
