[SCM] libav/experimental: Make avfilter_parse_graph() output a more meaningful message when an invalid filterchain is detected.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:20:02 UTC 2013


The following commit has been merged in the experimental branch:
commit 9241cd2095fe8395e02be5556d657d06f65ba91f
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Dec 12 13:39:16 2010 +0000

    Make avfilter_parse_graph() output a more meaningful message when an
    invalid filterchain is detected.
    
    Originally committed as revision 25936 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 678b7be..add3019 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -338,6 +338,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
 
     do {
         AVFilterContext *filter;
+        const char *filterchain = filters;
         filters += strspn(filters, WHITESPACES);
 
         if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0)
@@ -365,8 +366,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
 
         if (chr == ';' && curr_inputs) {
             av_log(log_ctx, AV_LOG_ERROR,
-                   "Could not find a output to link when parsing \"%s\"\n",
-                   filters - 1);
+                   "Invalid filterchain containing an unlabelled output pad: \"%s\"\n",
+                   filterchain);
             ret = AVERROR(EINVAL);
             goto fail;
         }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list