mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-07 16:40:10 +02:00
Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'
* commit '49670e4218d34899a1c37abb7a11615efc16f757': avconv: add a function for determining whether a filtergraph is simple Conflicts: avconv.c Merged-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
commit
9aa3023672
4
ffmpeg.c
4
ffmpeg.c
@ -3293,7 +3293,7 @@ static int transcode_init(void)
|
||||
ist = input_streams[i];
|
||||
|
||||
for (j = 0; j < ist->nb_filters; j++) {
|
||||
if (ist->filters[j]->graph->graph_desc) {
|
||||
if (!filtergraph_is_simple(ist->filters[j]->graph)) {
|
||||
av_log(NULL, AV_LOG_INFO, " Stream #%d:%d (%s) -> %s",
|
||||
ist->file_index, ist->st->index, ist->dec ? ist->dec->name : "?",
|
||||
ist->filters[j]->name);
|
||||
@ -3314,7 +3314,7 @@ static int transcode_init(void)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ost->filter && ost->filter->graph->graph_desc) {
|
||||
if (ost->filter && !filtergraph_is_simple(ost->filter->graph)) {
|
||||
/* output from a complex graph */
|
||||
av_log(NULL, AV_LOG_INFO, " %s", ost->filter->name);
|
||||
if (nb_filtergraphs > 1)
|
||||
|
1
ffmpeg.h
1
ffmpeg.h
@ -573,6 +573,7 @@ void choose_sample_fmt(AVStream *st, AVCodec *codec);
|
||||
int configure_filtergraph(FilterGraph *fg);
|
||||
int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out);
|
||||
int ist_in_filtergraph(FilterGraph *fg, InputStream *ist);
|
||||
int filtergraph_is_simple(FilterGraph *fg);
|
||||
FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
|
||||
int init_complex_filtergraph(FilterGraph *fg);
|
||||
|
||||
|
@ -979,7 +979,7 @@ static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter,
|
||||
int configure_filtergraph(FilterGraph *fg)
|
||||
{
|
||||
AVFilterInOut *inputs, *outputs, *cur;
|
||||
int ret, i, simple = !fg->graph_desc;
|
||||
int ret, i, simple = filtergraph_is_simple(fg);
|
||||
const char *graph_desc = simple ? fg->outputs[0]->ost->avfilter :
|
||||
fg->graph_desc;
|
||||
|
||||
@ -1102,3 +1102,7 @@ int ist_in_filtergraph(FilterGraph *fg, InputStream *ist)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int filtergraph_is_simple(FilterGraph *fg)
|
||||
{
|
||||
return !fg->graph_desc;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user