diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-02-01 15:32:21 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-02-08 21:01:31 +0100 |
| commit | 38d553322891c8e47182f05199d19888422167dc (patch) | |
| tree | c65ae36daf4d68dfdbea62accc7f33630cc338f5 /libswscale | |
| parent | 8e37038a3458e6b55c9ebc28f077e2119a41b59e (diff) | |
| download | ffmpeg-38d553322891c8e47182f05199d19888422167dc.tar.gz | |
pixdesc: mark pseudopaletted formats with a special flag.
This makes it possible to dintinguish them from PAL8.
Fixes an invalid write in avpicture_layout().
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 0f5404e154..bc36826ea2 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -627,7 +627,9 @@ const char *sws_format_name(enum PixelFormat format); (av_pix_fmt_descriptors[x].nb_components >= 2 && \ (av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) -#define usePal(x) ((av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) || (x) == PIX_FMT_Y400A) +#define usePal(x) ((av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) || \ + (av_pix_fmt_descriptors[x].flags & PIX_FMT_PSEUDOPAL) || \ + (x) == PIX_FMT_Y400A) extern const uint64_t ff_dither4[2]; extern const uint64_t ff_dither8[2]; |