generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "lavfi: always check av_expr_parse_and_eval() return value"

Browse Source 
This reverts commit 63be97ec403023fb664798432acedaf6e6922527.

All those calls were unchecked on purpose, as explained in the comments
in the code.
This commit is contained in:
Anton Khirnov 2015-05-02 09:09:52 +02:00
parent 60f1cc4a1f
commit 3735b5c616
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_pad.c
View File

@ -158,10 +158,9 @@ static int config_input(AVFilterLink *inlink)
var_values[VAR_VSUB] = 1<<s->vsub; var_values[VAR_VSUB] = 1<<s->vsub;
/* evaluate width and height */ /* evaluate width and height */
if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr), av_expr_parse_and_eval(&res, (expr = s->w_expr),
var_names, var_values, var_names, var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) NULL, NULL, NULL, NULL, NULL, 0, ctx);
goto eval_fail;
s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr),
var_names, var_values, var_names, var_values,
@ -176,10 +175,9 @@ static int config_input(AVFilterLink *inlink)
s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; s->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
/* evaluate x and y */ /* evaluate x and y */
if ((ret = av_expr_parse_and_eval(&res, (expr = s->x_expr), av_expr_parse_and_eval(&res, (expr = s->x_expr),
var_names, var_values, var_names, var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) NULL, NULL, NULL, NULL, NULL, 0, ctx);
goto eval_fail;
s->x = var_values[VAR_X] = res; s->x = var_values[VAR_X] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = s->y_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->y_expr),
var_names, var_values, var_names, var_values,

7
libavfilter/vf_scale.c
View File

@ -177,10 +177,9 @@ static int config_props(AVFilterLink *outlink)
var_values[VAR_VSUB] = 1 << desc->log2_chroma_h; var_values[VAR_VSUB] = 1 << desc->log2_chroma_h;
/* evaluate width and height */ /* evaluate width and height */
if ((ret = av_expr_parse_and_eval(&res, (expr = scale->w_expr), av_expr_parse_and_eval(&res, (expr = scale->w_expr),
var_names, var_values, var_names, var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) NULL, NULL, NULL, NULL, NULL, 0, ctx);
goto fail;
scale->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; scale->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = scale->h_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = scale->h_expr),
var_names, var_values, var_names, var_values,