[FFmpeg-cvslog] lavfi/avfiltergraph: avoid to print "(null)" in the scale args

Stefano Sabatini git at videolan.org
Sun Oct 21 22:45:39 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Oct 17 10:14:15 2012 +0200| [8f37a1e8dc93df5530df45a6f6fcf2d8dd3722e0] | committer: Stefano Sabatini

lavfi/avfiltergraph: avoid to print "(null)" in the scale args

Fix parsing.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f37a1e8dc93df5530df45a6f6fcf2d8dd3722e0
---

 libavfilter/avfiltergraph.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 980cdf2..86be2c4 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -358,7 +358,11 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
 
                     snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
                              scaler_count++);
-                    snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
+                    if (graph->scale_sws_opts)
+                        snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
+                    else
+                        snprintf(scale_args, sizeof(scale_args), "0:0");
+
                     if ((ret = avfilter_graph_create_filter(&convert, filter,
                                                             inst_name, scale_args, NULL,
                                                             graph)) < 0)



More information about the ffmpeg-cvslog mailing list