From 2268db2cd052674fde55c7d48b7a5098ce89b4ba Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 3 Sep 2015 13:44:14 +0200 Subject: lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields The new fields can be accessed directly and are more intelligible. Signed-off-by: Vittorio Giovara --- libswscale/swscale_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libswscale/swscale_internal.h') diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index fdaaeeb67f..4d921cde47 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -562,14 +562,14 @@ static av_always_inline int is16BPS(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return desc->comp[0].depth_minus1 == 15; + return desc->comp[0].depth == 16; } static av_always_inline int is9_OR_10BPS(enum AVPixelFormat pix_fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); av_assert0(desc); - return desc->comp[0].depth_minus1 == 8 || desc->comp[0].depth_minus1 == 9; + return desc->comp[0].depth == 9 || desc->comp[0].depth == 10; } static av_always_inline int isBE(enum AVPixelFormat pix_fmt) -- cgit v1.2.3