Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'

[ffmpeg] / libavfilter / fifo.c

diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
index 4e0e87f83d6d2a5847aa5868737c7c491da682a4..8c978cc93cf77c9ed0d45ac270194f7218aa33ae 100644 (file)
--- a/libavfilter/fifo.c
+++ b/libavfilter/fifo.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/audioconvert.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/samplefmt.h"
 
@@ -281,7 +282,7 @@ AVFilter avfilter_vf_fifo = {
                                           .start_frame     = add_to_queue,
                                           .draw_slice      = draw_slice,
                                           .end_frame       = end_frame,
-                                          .rej_perms       = AV_PERM_REUSE2, },
+                                          .min_perms       = AV_PERM_PRESERVE, },
                                         { .name = NULL}},
     .outputs   = (const AVFilterPad[]) {{ .name            = "default",
                                           .type            = AVMEDIA_TYPE_VIDEO,
@@ -302,7 +303,7 @@ AVFilter avfilter_af_afifo = {
                                           .type             = AVMEDIA_TYPE_AUDIO,
                                           .get_audio_buffer = ff_null_get_audio_buffer,
                                           .filter_samples   = add_to_queue,
-                                          .rej_perms        = AV_PERM_REUSE2, },
+                                          .min_perms        = AV_PERM_PRESERVE, },
                                         { .name = NULL}},
     .outputs   = (const AVFilterPad[]) {{ .name             = "default",
                                           .type             = AVMEDIA_TYPE_AUDIO,