virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg: move ifilter_has_all_input_formats() to ffmpeg_filter

Browse Source 
That is a more appropriate place for that function.
This commit is contained in:
Anton Khirnov
2023-05-13 09:58:43 +02:00
parent 2628c7049e
commit 82c75ddfad
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fftools/ffmpeg.c
View File

@@ -787,18 +787,6 @@ static void check_decode_result(InputStream *ist, int *got_output, int ret)
} }
} }
// Filters can be configured only if the formats of all inputs are known.
int ifilter_has_all_input_formats(FilterGraph *fg)
{
int i;
for (i = 0; i < fg->nb_inputs; i++) {
if (fg->inputs[i]->format < 0 && (fg->inputs[i]->type == AVMEDIA_TYPE_AUDIO ||
fg->inputs[i]->type == AVMEDIA_TYPE_VIDEO))
return 0;
}
return 1;
}
// This does not quite work like avcodec_decode_audio4/avcodec_decode_video2. // This does not quite work like avcodec_decode_audio4/avcodec_decode_video2.
// There is the following difference: if you got a frame, you must call // There is the following difference: if you got a frame, you must call
// it again with pkt=NULL. pkt==NULL is treated differently from pkt->size==0 // it again with pkt=NULL. pkt==NULL is treated differently from pkt->size==0

12
fftools/ffmpeg_filter.c
View File

@@ -1445,6 +1445,18 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr
return 0; return 0;
} }
// Filters can be configured only if the formats of all inputs are known.
int ifilter_has_all_input_formats(FilterGraph *fg)
{
int i;
for (i = 0; i < fg->nb_inputs; i++) {
if (fg->inputs[i]->format < 0 && (fg->inputs[i]->type == AVMEDIA_TYPE_AUDIO ||
fg->inputs[i]->type == AVMEDIA_TYPE_VIDEO))
return 0;
}
return 1;
}
int filtergraph_is_simple(FilterGraph *fg) int filtergraph_is_simple(FilterGraph *fg)
{ {
FilterGraphPriv *fgp = fgp_from_fg(fg); FilterGraphPriv *fgp = fgp_from_fg(fg);