Merge commit 'dad5fd59f3d6a8311365314cfcde0ebcd15c2b01'

[ffmpeg] / libavfilter / vf_shuffleplanes.c

diff --git a/libavfilter/vf_shuffleplanes.c b/libavfilter/vf_shuffleplanes.c
index 4bc7b79f8743cd49e52f5589f156eb9ef548645c..5d1302db048d2de1dbe8f35a127621b7d9487b93 100644 (file)
--- a/libavfilter/vf_shuffleplanes.c
+++ b/libavfilter/vf_shuffleplanes.c
@@ -69,7 +69,7 @@ static av_cold int shuffleplanes_config_input(AVFilterLink *inlink)
         }
 
         if ((desc->flags & AV_PIX_FMT_FLAG_PAL ||
-             desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) &&
+             desc->flags & FF_PSEUDOPAL) &&
             (i == 1) != (s->map[i] == 1)) {
             av_log(ctx, AV_LOG_ERROR,
                    "Cannot map between a palette plane and a data plane.\n");
@@ -158,10 +158,9 @@ static const AVFilterPad shuffleplanes_outputs[] = {
 AVFilter ff_vf_shuffleplanes = {
     .name         = "shuffleplanes",
     .description  = NULL_IF_CONFIG_SMALL("Shuffle video planes."),
-
     .priv_size    = sizeof(ShufflePlanesContext),
     .priv_class   = &shuffleplanes_class,
-
     .inputs       = shuffleplanes_inputs,
     .outputs      = shuffleplanes_outputs,
+    .flags        = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
 };