diff options
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_crop.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_pixdesctest.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_scale.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index b3a82aae80..f9039b5943 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -278,7 +278,8 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref) ref2->data[0] += crop->y * ref2->linesize[0]; ref2->data[0] += crop->x * crop->max_step[0]; - if (!(av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL)) { + if (!(av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PAL || + av_pix_fmt_descriptors[link->format].flags & PIX_FMT_PSEUDOPAL)) { for (i = 1; i < 3; i ++) { if (ref2->data[i]) { ref2->data[i] += (crop->y >> crop->vsub) * ref2->linesize[i]; diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 901f3540b7..97e0f2f53e 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -72,7 +72,8 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) } /* copy palette */ - if (priv->pix_desc->flags & PIX_FMT_PAL) + if (priv->pix_desc->flags & PIX_FMT_PAL || + priv->pix_desc->flags & PIX_FMT_PSEUDOPAL) memcpy(outpicref->data[1], outpicref->data[1], 256*4); avfilter_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0)); diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 5bca9fc184..0437751667 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -212,7 +212,8 @@ static int config_props(AVFilterLink *outlink) outlink->w, outlink->h, av_pix_fmt_descriptors[outlink->format].name, scale->flags); - scale->input_is_pal = av_pix_fmt_descriptors[inlink->format].flags & PIX_FMT_PAL; + scale->input_is_pal = av_pix_fmt_descriptors[inlink->format].flags & PIX_FMT_PAL || + av_pix_fmt_descriptors[inlink->format].flags & PIX_FMT_PSEUDOPAL; if (outfmt == PIX_FMT_PAL8) outfmt = PIX_FMT_BGR8; if (scale->sws) |