virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

fftools/ffmpeg: access output file chapters through a wrapper

Browse Source 
Avoid accessing the muxer context directly, as this will become
forbidden in future commits.
This commit is contained in:
Anton Khirnov 2021-12-11 16:10:41 +01:00
parent 4877842bb5
commit 48989efb76
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/ffmpeg.c
View File

@ -2868,12 +2868,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");
@ -2882,8 +2885,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;

2
fftools/ffmpeg.h
View File

@ -707,5 +707,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 */

7
fftools/ffmpeg_mux.c
View File

@ -382,3 +382,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;
}