diff mbox

[FFmpeg-devel] avfilter/drawtext: log why input pad failed to be configured

Message ID 20191223161639.2130-1-ffmpeg@gyani.pro
State Accepted
Commit 287620f59c5e5b3d65855f71048a8fe7db142451
Headers show

Commit Message

Gyan Doshi Dec. 23, 2019, 4:16 p.m. UTC 
---
 libavfilter/vf_drawtext.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Comments

Michael Niedermayer Dec. 23, 2019, 11:22 p.m. UTC | #1 
On Mon, Dec 23, 2019 at 09:46:39PM +0530, Gyan Doshi wrote:
> ---
>  libavfilter/vf_drawtext.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)

LGTM

thx

[...]
Gyan Doshi Dec. 24, 2019, 5:36 a.m. UTC | #2 
On 24-12-2019 04:52 am, Michael Niedermayer wrote:
> On Mon, Dec 23, 2019 at 09:46:39PM +0530, Gyan Doshi wrote:
>> ---
>>   libavfilter/vf_drawtext.c | 12 +++++++-----
>>   1 file changed, 7 insertions(+), 5 deletions(-)
> LGTM

Pushed as 287620f59c5e5b3d65855f71048a8fe7db142451

Thanks,
Gyan
diff mbox

Patch

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 8f4badbdb5..aea17b6793 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -829,6 +829,7 @@  static int config_input(AVFilterLink *inlink)
 {
     AVFilterContext *ctx = inlink->dst;
     DrawTextContext *s = ctx->priv;
+    char *expr;
     int ret;
 
     ff_draw_init(&s->dc, inlink->format, FF_DRAW_PROCESS_ALPHA);
@@ -854,14 +855,15 @@  static int config_input(AVFilterLink *inlink)
     av_expr_free(s->a_pexpr);
     s->x_pexpr = s->y_pexpr = s->a_pexpr = NULL;
 
-    if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names,
+    if ((ret = av_expr_parse(&s->x_pexpr, expr = s->x_expr, var_names,
                              NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
-        (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names,
+        (ret = av_expr_parse(&s->y_pexpr, expr = s->y_expr, var_names,
                              NULL, NULL, fun2_names, fun2, 0, ctx)) < 0 ||
-        (ret = av_expr_parse(&s->a_pexpr, s->a_expr, var_names,
-                             NULL, NULL, fun2_names, fun2, 0, ctx)) < 0)
-
+        (ret = av_expr_parse(&s->a_pexpr, expr = s->a_expr, var_names,
+                             NULL, NULL, fun2_names, fun2, 0, ctx)) < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Failed to parse expression: %s \n", expr);
         return AVERROR(EINVAL);
+    }
 
     return 0;
 }