X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_crop.c;h=b3a82aae800ac6a8496a5251d14de930ba3e3da8;hb=16b771b1f47daa9fec84477040984d83a92ba4a6;hp=fb084041abca5e59f26263759e3db318b9db74bf;hpb=23c1db9b83b5928a312b8d7cd753d04d49c252b6;p=ffmpeg diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index fb084041abc..b3a82aae800 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -32,10 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/mathematics.h" -static const char *var_names[] = { - "E", - "PHI", - "PI", +static const char * const var_names[] = { "in_w", "iw", ///< width of the input video "in_h", "ih", ///< height of the input video "out_w", "ow", ///< width of the cropped video @@ -54,9 +51,6 @@ static const char *var_names[] = { }; enum var_name { - VAR_E, - VAR_PHI, - VAR_PI, VAR_IN_W, VAR_IW, VAR_IN_H, VAR_IH, VAR_OUT_W, VAR_OW, @@ -167,9 +161,6 @@ static int config_input(AVFilterLink *link) const char *expr; double res; - crop->var_values[VAR_E] = M_E; - crop->var_values[VAR_PHI] = M_PHI; - crop->var_values[VAR_PI] = M_PI; crop->var_values[VAR_IN_W] = crop->var_values[VAR_IW] = ctx->inputs[0]->w; crop->var_values[VAR_IN_H] = crop->var_values[VAR_IH] = ctx->inputs[0]->h; crop->var_values[VAR_A] = (float) link->w / link->h; @@ -342,7 +333,7 @@ AVFilter avfilter_vf_crop = { .init = init, .uninit = uninit, - .inputs = (AVFilterPad[]) {{ .name = "default", + .inputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, .start_frame = start_frame, .draw_slice = draw_slice, @@ -350,7 +341,7 @@ AVFilter avfilter_vf_crop = { .get_video_buffer = avfilter_null_get_video_buffer, .config_props = config_input, }, { .name = NULL}}, - .outputs = (AVFilterPad[]) {{ .name = "default", + .outputs = (const AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, }, { .name = NULL}},