diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-12-21 06:41:57 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-12-22 11:01:28 +0100 |
| commit | 131609dc2a75e6783396853023d6f49333e3f495 (patch) | |
| tree | 2e39266090c2596081da84b71d2891289adbc816 | |
| parent | 4bf3c8f226252e18de8051fd0d417c1d39857b67 (diff) | |
| download | ffmpeg-131609dc2a75e6783396853023d6f49333e3f495.tar.gz | |
sws: readd PAL8 to isPacked()
Fixes PAL8 to YUV conversion.
| -rw-r--r-- | libswscale/swscale_internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 50554439f0..bb3b52d8c9 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -609,9 +609,11 @@ const char *sws_format_name(enum PixelFormat format); (av_pix_fmt_descriptors[x].nb_components == 2 || \ av_pix_fmt_descriptors[x].nb_components == 4) -#define isPacked(x) \ +#define isPacked(x) (\ (av_pix_fmt_descriptors[x].nb_components >= 2 && \ - !(av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) + !(av_pix_fmt_descriptors[x].flags & PIX_FMT_PLANAR)) || \ + (x) == PIX_FMT_PAL8\ + ) #define isPlanar(x) \ (av_pix_fmt_descriptors[x].nb_components >= 2 && \ |