avconv: add a function for determining whether a filtergraph is simple

This makes the code easier to read.

diff --git a/avconv.c b/avconv.c
index 2e3bde925ecbd291297f7429eed0518602ddd4fe..8cb8d142e82277d492be7e8d2478054eb980c103 100644 (file)
--- a/avconv.c
+++ b/avconv.c
@@ -2123,7 +2123,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);
@@ -2144,7 +2144,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)

diff --git a/avconv.h b/avconv.h
index 84fabf63713dbf0fdf13940eb115a696ed829193..be8ef23e51a31b08d904454db34422a2929e8ab3 100644 (file)
--- a/avconv.h
+++ b/avconv.h
@@ -449,6 +449,7 @@ int guess_input_channel_layout(InputStream *ist);
 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);
 

diff --git a/avconv_filter.c b/avconv_filter.c
index a412f6e3143434c9938322809b679a6ce15f45bf..1d4aeb0770e9a3231627848374dcb16aeb8503c0 100644 (file)
--- a/avconv_filter.c
+++ b/avconv_filter.c
@@ -691,7 +691,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;
 
@@ -760,3 +760,7 @@ int ist_in_filtergraph(FilterGraph *fg, InputStream *ist)
     return 0;
 }
 
+int filtergraph_is_simple(FilterGraph *fg)
+{
+    return !fg->graph_desc;
+}