summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-14 01:46:26 +0200
committerJames Almer <jamrial@gmail.com>2021-04-27 10:43:13 -0300
commit985c0dac674846721ec8ff23344c16ac7d1c9a1e (patch)
tree1979990f3e66231dca31b81ce0426b227eeaf71e /libavfilter
parent1eb311011548867b118dd461442365195fb5fb7d (diff)
avutil/pixdesc: Remove deprecated AV_PIX_FMT_FLAG_PSEUDOPAL
Deprecated in d6fc031caf64eed921bbdef86d79d56bfc2633b0. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/drawutils.c2
-rw-r--r--libavfilter/framepool.c6
-rw-r--r--libavfilter/vf_crop.c2
-rw-r--r--libavfilter/vf_pixdesctest.c3
-rw-r--r--libavfilter/vf_scale.c3
-rw-r--r--libavfilter/vf_untile.c2
6 files changed, 7 insertions, 11 deletions
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 0a59ff9987..f95e12091b 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -91,7 +91,7 @@ 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 | FF_PSEUDOPAL | AV_PIX_FMT_FLAG_ALPHA))
+ if (desc->flags & ~(AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA))
return AVERROR(ENOSYS);
if (format == AV_PIX_FMT_P010LE || format == AV_PIX_FMT_P010BE || format == AV_PIX_FMT_P016LE || format == AV_PIX_FMT_P016BE)
return AVERROR(ENOSYS);
diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
index dab8891524..5f67fa170a 100644
--- a/libavfilter/framepool.c
+++ b/libavfilter/framepool.c
@@ -102,8 +102,7 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size),
goto fail;
}
- if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
- desc->flags & FF_PSEUDOPAL) {
+ if (desc->flags & AV_PIX_FMT_FLAG_PAL) {
pool->pools[1] = av_buffer_pool_init(AVPALETTE_SIZE, alloc);
if (!pool->pools[1])
goto fail;
@@ -226,8 +225,7 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool)
frame->data[i] = frame->buf[i]->data;
}
- if (desc->flags & AV_PIX_FMT_FLAG_PAL ||
- desc->flags & FF_PSEUDOPAL) {
+ if (desc->flags & AV_PIX_FMT_FLAG_PAL) {
enum AVPixelFormat format =
pool->format == AV_PIX_FMT_PAL8 ? AV_PIX_FMT_BGR8 : pool->format;
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 3d5cb95f78..dffb6dab5e 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -300,7 +300,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame)
frame->data[0] += s->y * frame->linesize[0];
frame->data[0] += s->x * s->max_step[0];
- if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & FF_PSEUDOPAL)) {
+ if (!(desc->flags & AV_PIX_FMT_FLAG_PAL)) {
for (i = 1; i < 3; i ++) {
if (frame->data[i]) {
frame->data[i] += (s->y >> s->vsub) * frame->linesize[i];
diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c
index 680d1a772a..066b8a0290 100644
--- a/libavfilter/vf_pixdesctest.c
+++ b/libavfilter/vf_pixdesctest.c
@@ -80,8 +80,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
}
/* copy palette */
- if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL ||
- ((priv->pix_desc->flags & FF_PSEUDOPAL) && out->data[1] && in->data[1]))
+ if (priv->pix_desc->flags & AV_PIX_FMT_FLAG_PAL)
memcpy(out->data[1], in->data[1], AVPALETTE_SIZE);
for (c = 0; c < priv->pix_desc->nb_components; c++) {
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 5ad9334d02..3add31bace 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -510,8 +510,7 @@ static int config_props(AVFilterLink *outlink)
scale->input_is_pal = desc->flags & AV_PIX_FMT_FLAG_PAL;
if (outfmt == AV_PIX_FMT_PAL8) outfmt = AV_PIX_FMT_BGR8;
- scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL ||
- av_pix_fmt_desc_get(outfmt)->flags & FF_PSEUDOPAL;
+ scale->output_is_pal = av_pix_fmt_desc_get(outfmt)->flags & AV_PIX_FMT_FLAG_PAL;
if (scale->sws)
sws_freeContext(scale->sws);
diff --git a/libavfilter/vf_untile.c b/libavfilter/vf_untile.c
index 9a2eb24901..154b92d08c 100644
--- a/libavfilter/vf_untile.c
+++ b/libavfilter/vf_untile.c
@@ -136,7 +136,7 @@ static int activate(AVFilterContext *ctx)
out->height = outlink->h;
out->data[0] += y * out->linesize[0];
out->data[0] += x * s->max_step[0];
- if (!(s->desc->flags & AV_PIX_FMT_FLAG_PAL || s->desc->flags & FF_PSEUDOPAL)) {
+ if (!(s->desc->flags & AV_PIX_FMT_FLAG_PAL)) {
for (i = 1; i < 3; i ++) {
if (out->data[i]) {
out->data[i] += (y >> s->desc->log2_chroma_w) * out->linesize[i];