highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: pass framerate through InputFilterOptions

Browse Source 
Rather than read it directly from InputStream.

This is a step towards avoiding the assumption that filtergraph inputs
are always fed by demuxers.
This commit is contained in:
Anton Khirnov
2024-02-13 12:18:27 +01:00
parent fef3052df3
commit 826cfd9997
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fftools/ffmpeg_filter.c
View File

@@ -1486,7 +1486,7 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph,
const AVFilter *buffer_filt = avfilter_get_by_name("buffer");
const AVPixFmtDescriptor *desc;
InputStream *ist = ifp->ist;
AVRational fr = ist->framerate;
AVRational fr = ifp->opts.framerate;
AVRational sar;
AVBPrint args;
char name[255];
@@ -1495,14 +1495,11 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph,
if (!par)
return AVERROR(ENOMEM);
if (!fr.num)
fr = ist->framerate_guessed;
if (ifp->type_src == AVMEDIA_TYPE_SUBTITLE)
sub2video_prepare(ifp);
ifp->time_base = ist->framerate.num ? av_inv_q(ist->framerate) :
ist->st->time_base;
ifp->time_base = (ifp->opts.flags & IFILTER_FLAG_CFR) ?
av_inv_q(ifp->opts.framerate) : ist->st->time_base;
sar = ifp->sample_aspect_ratio;
if(!sar.den)