diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:28:19 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 08:02:30 +0100 |
| commit | ff6bc16c5ad94704615b2cc9cb7f238e61bbe12d (patch) | |
| tree | de7b022b76394a5e41a77f53a50f0c4c3a7e7375 /libswscale/swscale_internal.h | |
| parent | 2b9a52bcca7d0b95c974a9addaad29e917dd3d40 (diff) | |
| download | ffmpeg-streaming-ff6bc16c5ad94704615b2cc9cb7f238e61bbe12d.zip ffmpeg-streaming-ff6bc16c5ad94704615b2cc9cb7f238e61bbe12d.tar.gz | |
swscale: use a (more correct) function for isPacked
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index b1fec42..ea5df26 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -784,30 +784,15 @@ static av_always_inline int isALPHA(enum AVPixelFormat pix_fmt) return desc->flags & AV_PIX_FMT_FLAG_ALPHA; } -#if 1 -#define isPacked(x) ( \ - (x)==AV_PIX_FMT_PAL8 \ - || (x)==AV_PIX_FMT_YUYV422 \ - || (x)==AV_PIX_FMT_YVYU422 \ - || (x)==AV_PIX_FMT_UYVY422 \ - || (x)==AV_PIX_FMT_YA8 \ - || (x)==AV_PIX_FMT_YA16LE \ - || (x)==AV_PIX_FMT_YA16BE \ - || (x)==AV_PIX_FMT_AYUV64LE \ - || (x)==AV_PIX_FMT_AYUV64BE \ - || isRGBinInt(x) \ - || isBGRinInt(x) \ - ) -#else static av_always_inline int isPacked(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) || - pix_fmt == AV_PIX_FMT_PAL8); + return (desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) || + pix_fmt == AV_PIX_FMT_PAL8 || + pix_fmt == AV_PIX_FMT_MONOBLACK || pix_fmt == AV_PIX_FMT_MONOWHITE; } -#endif static av_always_inline int isPlanar(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); |
