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

fftools/ffmpeg_filter: only use fallback parameters when necessary 

With complex filtergraphs it can happen that the filtergraph is
unconfigured because some other filter than the one we just got EOF on
is missing parameters.

Make sure that the fallback parametes for a given input are only used
when that input is unconfigured.
This commit is contained in:
Anton Khirnov 2023-05-11 11:59:44 +02:00
parent 65f3d042a6
commit a16d7171d1
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg_filter.c
View File

@ -1521,6 +1521,7 @@ int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb)
if (ret < 0) if (ret < 0)
return ret; return ret;
} else { } else {
if (ifilter->format < 0) {
// the filtergraph was never configured, use the fallback parameters // the filtergraph was never configured, use the fallback parameters
ifilter->format = ifp->fallback.format; ifilter->format = ifp->fallback.format;
ifilter->sample_rate = ifp->fallback.sample_rate; ifilter->sample_rate = ifp->fallback.sample_rate;
@ -1532,6 +1533,7 @@ int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb)
&ifp->fallback.ch_layout); &ifp->fallback.ch_layout);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
if (ifilter->format < 0 && (ifilter->type == AVMEDIA_TYPE_AUDIO || ifilter->type == AVMEDIA_TYPE_VIDEO)) { if (ifilter->format < 0 && (ifilter->type == AVMEDIA_TYPE_AUDIO || ifilter->type == AVMEDIA_TYPE_VIDEO)) {
av_log(NULL, AV_LOG_ERROR, "Cannot determine format of input stream %d:%d after EOF\n", ifilter->ist->file_index, ifilter->ist->st->index); av_log(NULL, AV_LOG_ERROR, "Cannot determine format of input stream %d:%d after EOF\n", ifilter->ist->file_index, ifilter->ist->st->index);