avconv: Do not try to configure filter outputs without streams

Message ID 20151007173452.A62F65DACF@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Oct. 7, 2015, 5:34 p.m.
Module: libav
Branch: master
Commit: 8b830ee9a26d47b138f12a82085cdb372f407f1e

Author:    Luca Barbato <lu_zero@gentoo.org>
Committer: Luca Barbato <lu_zero@gentoo.org>
Date:      Mon Oct  5 20:49:55 2015 +0200

avconv: Do not try to configure filter outputs without streams

Prevent a NULL-dereference.

CC: libav-stable@libav.org

---

 avconv_filter.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/avconv_filter.c b/avconv_filter.c
index 976d521..0127580 100644
--- a/avconv_filter.c
+++ b/avconv_filter.c
@@ -702,8 +702,12 @@  int configure_filtergraph(FilterGraph *fg)
             return ret;
     avfilter_inout_free(&inputs);
 
-    for (cur = outputs, i = 0; cur; cur = cur->next, i++)
-        configure_output_filter(fg, fg->outputs[i], cur);
+    for (cur = outputs, i = 0; cur; cur = cur->next, i++) {
+        OutputFilter *ofilter = fg->outputs[i];
+        if (ofilter->ost)
+            configure_output_filter(fg, ofilter, cur);
+    }
+
     avfilter_inout_free(&outputs);
 
     if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0)