[FFmpeg-cvslog] vf_alphamerge: fix permissions.

Nicolas George git at videolan.org
Fri Aug 17 18:44:16 CEST 2012


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Aug 14 18:40:34 2012 +0200| [07663871e18d4b463e5ae53d86afd3ce9339eb34] | committer: Nicolas George

vf_alphamerge: fix permissions.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07663871e18d4b463e5ae53d86afd3ce9339eb34
---

 libavfilter/vf_alphamerge.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index fdcc013..613ca89 100644
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -192,15 +192,13 @@ AVFilter avfilter_vf_alphamerge = {
           .start_frame      = start_frame,
           .draw_slice       = draw_slice,
           .end_frame        = end_frame,
-          .min_perms        = AV_PERM_READ | AV_PERM_WRITE,
-          .rej_perms        = AV_PERM_REUSE2 | AV_PERM_PRESERVE },
+          .min_perms        = AV_PERM_READ | AV_PERM_WRITE | AV_PERM_PRESERVE },
         { .name             = "alpha",
           .type             = AVMEDIA_TYPE_VIDEO,
           .start_frame      = start_frame,
           .draw_slice       = draw_slice,
           .end_frame        = end_frame,
-          .min_perms        = AV_PERM_READ,
-          .rej_perms        = AV_PERM_REUSE2 },
+          .min_perms        = AV_PERM_READ | AV_PERM_PRESERVE },
         { .name = NULL }
     },
     .outputs   = (const AVFilterPad[]) {



More information about the ffmpeg-cvslog mailing list