From 33c2448d2f76a461721344eca0326b0237f88a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sun, 10 Mar 2013 02:32:35 +0100 Subject: [PATCH] lavfi: remove remaining forgotten min/rej perms. --- libavfilter/af_apad.c | 1 - libavfilter/af_channelmap.c | 4 ++-- libavfilter/f_select.c | 1 - libavfilter/sink_buffer.c | 4 ---- libavfilter/split.c | 1 - libavfilter/vf_alphamerge.c | 3 +-- libavfilter/vf_bbox.c | 1 - libavfilter/vf_deshake.c | 1 - libavfilter/vf_fps.c | 2 -- libavfilter/vf_idet.c | 2 -- libavfilter/vf_noise.c | 1 - libavfilter/vf_overlay.c | 1 - libavfilter/vf_smartblur.c | 1 - libavfilter/vf_yadif.c | 1 - 14 files changed, 3 insertions(+), 21 deletions(-) diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c index 2afd3a8..b3a4b95 100644 --- a/libavfilter/af_apad.c +++ b/libavfilter/af_apad.c @@ -139,7 +139,6 @@ static const AVFilterPad apad_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ, }, { NULL }, }; diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 85f333e..e73c4bc 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -388,9 +388,9 @@ static const AVFilterPad avfilter_af_channelmap_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_AUDIO, - .min_perms = AV_PERM_READ | AV_PERM_WRITE, .filter_frame = channelmap_filter_frame, - .config_props = channelmap_config_input + .config_props = channelmap_config_input, + .needs_writable = 1, }, { NULL } }; diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index 36ef507..603fad3 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -480,7 +480,6 @@ static const AVFilterPad avfilter_vf_select_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, - .min_perms = AV_PERM_PRESERVE, .config_props = config_input, .filter_frame = filter_frame, }, diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c index 07e4d04..8db3aa1 100644 --- a/libavfilter/sink_buffer.c +++ b/libavfilter/sink_buffer.c @@ -331,7 +331,6 @@ static const AVFilterPad ffbuffersink_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL }, }; @@ -353,7 +352,6 @@ static const AVFilterPad buffersink_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL }, }; @@ -467,7 +465,6 @@ static const AVFilterPad ffabuffersink_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL }, }; @@ -488,7 +485,6 @@ static const AVFilterPad abuffersink_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_AUDIO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL }, }; diff --git a/libavfilter/split.c b/libavfilter/split.c index fadbcc0..b57d8cd 100644 --- a/libavfilter/split.c +++ b/libavfilter/split.c @@ -52,7 +52,6 @@ static int split_init(AVFilterContext *ctx, const char *args) snprintf(name, sizeof(name), "output%d", i); pad.type = ctx->filter->inputs[0].type; pad.name = av_strdup(name); - pad.rej_perms = AV_PERM_WRITE; ff_insert_outpad(ctx, i, &pad); } diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index ead7ca7..0727f7b 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -176,12 +176,11 @@ static const AVFilterPad alphamerge_inputs[] = { .config_props = config_input_main, .get_video_buffer = ff_null_get_video_buffer, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_WRITE | AV_PERM_PRESERVE, + .needs_writable = 1, },{ .name = "alpha", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL } }; diff --git a/libavfilter/vf_bbox.c b/libavfilter/vf_bbox.c index a761b56..4ff0625 100644 --- a/libavfilter/vf_bbox.c +++ b/libavfilter/vf_bbox.c @@ -94,7 +94,6 @@ static const AVFilterPad bbox_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, .filter_frame = filter_frame, - .min_perms = AV_PERM_READ, }, { NULL } }; diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 318c399..138c25d 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -560,7 +560,6 @@ static const AVFilterPad deshake_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, .config_props = config_props, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, }, { NULL } }; diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 15eb656..3394252 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -273,7 +273,6 @@ static const AVFilterPad avfilter_vf_fps_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .min_perms = AV_PERM_READ | AV_PERM_PRESERVE, .filter_frame = filter_frame, }, { NULL } @@ -283,7 +282,6 @@ static const AVFilterPad avfilter_vf_fps_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .rej_perms = AV_PERM_WRITE, .request_frame = request_frame, .config_props = config_props }, diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 0b10663..f61ac5a 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -299,7 +299,6 @@ static const AVFilterPad idet_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, - .min_perms = AV_PERM_PRESERVE, }, { NULL } }; @@ -308,7 +307,6 @@ static const AVFilterPad idet_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .rej_perms = AV_PERM_WRITE, .request_frame = request_frame, }, { NULL } diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c index e80f461..7095324 100644 --- a/libavfilter/vf_noise.c +++ b/libavfilter/vf_noise.c @@ -343,7 +343,6 @@ static const AVFilterPad noise_inputs[] = { .get_video_buffer = ff_null_get_video_buffer, .filter_frame = filter_frame, .config_props = config_input, - .min_perms = AV_PERM_READ, }, { NULL } }; diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 313fef1..e7d213c 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -654,7 +654,6 @@ static const AVFilterPad avfilter_vf_overlay_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .rej_perms = AV_PERM_WRITE, .config_props = config_output, .request_frame = request_frame, }, diff --git a/libavfilter/vf_smartblur.c b/libavfilter/vf_smartblur.c index ccbd22b..7de1cd3 100644 --- a/libavfilter/vf_smartblur.c +++ b/libavfilter/vf_smartblur.c @@ -287,7 +287,6 @@ static const AVFilterPad smartblur_inputs[] = { .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, .config_props = config_props, - .min_perms = AV_PERM_READ, }, { NULL } }; diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 95f35b2..239dbc6 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -479,7 +479,6 @@ static const AVFilterPad avfilter_vf_yadif_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, - .min_perms = AV_PERM_PRESERVE, }, { NULL } }; -- 1.8.1.5