[FFmpeg-cvslog] avconv: Do not try to configure filter outputs without streams
Luca Barbato
git at videolan.org
Sat Oct 10 09:43:55 CEST 2015
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Oct 5 20:49:55 2015 +0200| [8b830ee9a26d47b138f12a82085cdb372f407f1e] | committer: Luca Barbato
avconv: Do not try to configure filter outputs without streams
Prevent a NULL-dereference.
CC: libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b830ee9a26d47b138f12a82085cdb372f407f1e
---
avconv_filter.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
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)
More information about the ffmpeg-cvslog
mailing list