Merge commit '29a8ed766354c45c9be4b8512c5b2eb25a450cdc'

[ffmpeg] / libavfilter / drawutils.c

diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 77ab86b7754547de44672c04950d60c067fcc885..db8c7a62261785e5b3b117303e3e504a8765fe64 100644 (file)
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -184,9 +184,9 @@ int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags)
 
     if (!desc || !desc->name)
         return AVERROR(EINVAL);
-    if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA))
+    if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | FF_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA))
         return AVERROR(ENOSYS);
-    if (format == AV_PIX_FMT_P010LE || format == AV_PIX_FMT_P010BE)
+    if (format == AV_PIX_FMT_P010LE || format == AV_PIX_FMT_P010BE || format == AV_PIX_FMT_P016LE || format == AV_PIX_FMT_P016BE)
         return AVERROR(ENOSYS);
     for (i = 0; i < desc->nb_components; i++) {
         c = &desc->comp[i];