Skip to content

F
ffmpeg-mt
Commit 42ed88c7 authored by ramiro's avatar ramiro
Browse files
Options

Set error parameter for ff_parse 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9377 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 73de7052
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
vhook/imlib2.c
View file @ 42ed88c7
...@@ -204,6 +204,7 @@ int Configure(void **ctxp, int argc, char *argv[]) ...@@ -204,6 +204,7 @@ int Configure(void **ctxp, int argc, char *argv[])
char *color = 0; char *color = 0;
FILE *f; FILE *f;
char *p; char *p;
char *error;
*ctxp = av_mallocz(sizeof(ContextInfo)); *ctxp = av_mallocz(sizeof(ContextInfo));
ci = (ContextInfo *) *ctxp; ci = (ContextInfo *) *ctxp;
...@@ -331,23 +332,23 @@ int Configure(void **ctxp, int argc, char *argv[]) ...@@ -331,23 +332,23 @@ int Configure(void **ctxp, int argc, char *argv[])
return -1; return -1;
} }
} else if (ci->eval_colors) { } else if (ci->eval_colors) {
if (!(ci->eval_r = ff_parse(ci->expr_R, const_names, NULL, NULL, NULL, NULL, NULL))){ if (!(ci->eval_r = ff_parse(ci->expr_R, const_names, NULL, NULL, NULL, NULL, &error))){
av_log(NULL, AV_LOG_ERROR, "Couldn't parse R expression '%s'\n", ci->expr_R); av_log(NULL, AV_LOG_ERROR, "Couldn't parse R expression '%s': %s\n", ci->expr_R, error);
return -1; return -1;
} }
if (!(ci->eval_g = ff_parse(ci->expr_G, const_names, NULL, NULL, NULL, NULL, NULL))){ if (!(ci->eval_g = ff_parse(ci->expr_G, const_names, NULL, NULL, NULL, NULL, &error))){
av_log(NULL, AV_LOG_ERROR, "Couldn't parse G expression '%s'\n", ci->expr_G); av_log(NULL, AV_LOG_ERROR, "Couldn't parse G expression '%s': %s\n", ci->expr_G, error);
return -1; return -1;
} }
if (!(ci->eval_b = ff_parse(ci->expr_B, const_names, NULL, NULL, NULL, NULL, NULL))){ if (!(ci->eval_b = ff_parse(ci->expr_B, const_names, NULL, NULL, NULL, NULL, &error))){
av_log(NULL, AV_LOG_ERROR, "Couldn't parse B expression '%s'\n", ci->expr_B); av_log(NULL, AV_LOG_ERROR, "Couldn't parse B expression '%s': %s\n", ci->expr_B, error);
return -1; return -1;
} }
} }
if (ci->expr_A) { if (ci->expr_A) {
if (!(ci->eval_a = ff_parse(ci->expr_A, const_names, NULL, NULL, NULL, NULL, NULL))){ if (!(ci->eval_a = ff_parse(ci->expr_A, const_names, NULL, NULL, NULL, NULL, &error))){
av_log(NULL, AV_LOG_ERROR, "Couldn't parse A expression '%s'\n", ci->expr_A); av_log(NULL, AV_LOG_ERROR, "Couldn't parse A expression '%s': %s\n", ci->expr_A, error);
return -1; return -1;
} }
} else { } else {
...@@ -369,13 +370,13 @@ int Configure(void **ctxp, int argc, char *argv[]) ...@@ -369,13 +370,13 @@ int Configure(void **ctxp, int argc, char *argv[])
ci->imageOverlaid_height = imlib_image_get_height(); ci->imageOverlaid_height = imlib_image_get_height();
} }
if (!(ci->eval_x = ff_parse(ci->expr_x, const_names, NULL, NULL, NULL, NULL, NULL))){ if (!(ci->eval_x = ff_parse(ci->expr_x, const_names, NULL, NULL, NULL, NULL, &error))){
av_log(NULL, AV_LOG_ERROR, "Couldn't parse x expression '%s'\n", ci->expr_x); av_log(NULL, AV_LOG_ERROR, "Couldn't parse x expression '%s': %s\n", ci->expr_x, error);
return -1; return -1;
} }
if (!(ci->eval_y = ff_parse(ci->expr_y, const_names, NULL, NULL, NULL, NULL, NULL))){ if (!(ci->eval_y = ff_parse(ci->expr_y, const_names, NULL, NULL, NULL, NULL, &error))){
av_log(NULL, AV_LOG_ERROR, "Couldn't parse y expression '%s'\n", ci->expr_y); av_log(NULL, AV_LOG_ERROR, "Couldn't parse y expression '%s': %s\n", ci->expr_y, error);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment