[FFmpeg-cvslog] vf_removelogo: fix permissions.
Nicolas George
git at videolan.org
Fri Aug 17 18:44:18 CEST 2012
ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Aug 14 18:48:22 2012 +0200| [f6647d8825c78b1006b056d2e168c21e3109f646] | committer: Nicolas George
vf_removelogo: fix permissions.
The branch with the test was already impossible.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6647d8825c78b1006b056d2e168c21e3109f646
---
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 7b0a662..7154a54 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[]) {
More information about the ffmpeg-cvslog
mailing list