diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-08-14 18:48:22 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-08-17 18:26:41 +0200 |
| commit | f6647d8825c78b1006b056d2e168c21e3109f646 (patch) | |
| tree | d7e5a0b52f62cd6a6af99d6bf14ba4c9b83d7675 /libavfilter/vf_removelogo.c | |
| parent | 616c3f3ee27b60d3a92ca824aabf1ab04e144da7 (diff) | |
| download | ffmpeg-f6647d8825c78b1006b056d2e168c21e3109f646.tar.gz | |
vf_removelogo: fix permissions.
The branch with the test was already impossible.
Diffstat (limited to 'libavfilter/vf_removelogo.c')
| -rw-r--r-- | libavfilter/vf_removelogo.c | 12 |
1 files 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[]) { |