diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-05-12 15:41:49 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-05-15 07:46:51 +0200 |
commit | e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28 (patch) | |
tree | f9d632e93ffd3b2fb7973da19bf1af63b1e33889 /libswscale/swscale_internal.h | |
parent | 7c57a582a03fb473091a88737ab92b9f2a5bb87a (diff) | |
download | ffmpeg-e6c4ac7b5f038be56dfbb0171f5dd0cb850d9b28.tar.gz |
pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*
Diffstat (limited to 'libswscale/swscale_internal.h')
-rw-r--r-- | libswscale/swscale_internal.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index f9f023f1cf..9544309cb7 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -596,33 +596,33 @@ static av_always_inline int isBE(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return desc->flags & PIX_FMT_BE; + return desc->flags & AV_PIX_FMT_FLAG_BE; } static av_always_inline int isYUV(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return !(desc->flags & PIX_FMT_RGB) && desc->nb_components >= 2; + return !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 2; } static av_always_inline int isPlanarYUV(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & PIX_FMT_PLANAR) && isYUV(pix_fmt)); + return ((desc->flags & AV_PIX_FMT_FLAG_PLANAR) && isYUV(pix_fmt)); } static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return (desc->flags & PIX_FMT_RGB); + return (desc->flags & AV_PIX_FMT_FLAG_RGB); } #if 0 // FIXME #define isGray(x) \ - (!(av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL) && \ + (!(av_pix_fmt_descriptors[x].flags & AV_PIX_FMT_FLAG_PAL) && \ av_pix_fmt_descriptors[x].nb_components <= 2) #else #define isGray(x) \ @@ -683,7 +683,7 @@ 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 & PIX_FMT_PLANAR)) || + return ((desc->nb_components >= 2 && !(desc->flags & AV_PIX_FMT_FLAG_PLANAR)) || pix_fmt == AV_PIX_FMT_PAL8); } @@ -691,29 +691,29 @@ static av_always_inline int isPlanar(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return (desc->nb_components >= 2 && (desc->flags & PIX_FMT_PLANAR)); + return (desc->nb_components >= 2 && (desc->flags & AV_PIX_FMT_FLAG_PLANAR)); } static av_always_inline int isPackedRGB(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & (PIX_FMT_PLANAR | PIX_FMT_RGB)) == PIX_FMT_RGB); + return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) == AV_PIX_FMT_FLAG_RGB); } static av_always_inline int isPlanarRGB(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & (PIX_FMT_PLANAR | PIX_FMT_RGB)) == - (PIX_FMT_PLANAR | PIX_FMT_RGB)); + return ((desc->flags & (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)) == + (AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB)); } static av_always_inline int usePal(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return ((desc->flags & PIX_FMT_PAL) || (desc->flags & PIX_FMT_PSEUDOPAL) || + return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) || pix_fmt == AV_PIX_FMT_Y400A); } |