From f6647d8825c78b1006b056d2e168c21e3109f646 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Tue, 14 Aug 2012 18:48:22 +0200 Subject: [PATCH] vf_removelogo: fix permissions. The branch with the test was already impossible. --- libavfilter/vf_removelogo.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index 7b0a662b92..7154a54984 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -477,14 +477,7 @@ static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterBufferRef *outpicref; - if (inpicref->perms & AV_PERM_PRESERVE) { - outpicref = ff_get_video_buffer(outlink, AV_PERM_WRITE, - outlink->w, outlink->h); - avfilter_copy_buffer_ref_props(outpicref, inpicref); - outpicref->video->w = outlink->w; - outpicref->video->h = outlink->h; - } else - outpicref = inpicref; + outpicref = inpicref; outlink->out_buf = outpicref; return ff_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0)); @@ -558,8 +551,7 @@ AVFilter avfilter_vf_removelogo = { .draw_slice = null_draw_slice, .start_frame = start_frame, .end_frame = end_frame, - .min_perms = AV_PERM_WRITE | AV_PERM_READ, - .rej_perms = AV_PERM_PRESERVE }, + .min_perms = AV_PERM_WRITE | AV_PERM_READ }, { .name = NULL } }, .outputs = (const AVFilterPad[]) {