From 5d8e836d0ec3bcaabf5bc2020210a1bc61975922 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Tue, 8 Sep 2015 17:10:48 +0200 Subject: Replace all remaining occurances of step/depth_minus1 and offset_plus1 --- libavcodec/jpeg2000dec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/jpeg2000dec.c') diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index a414dc1ebf..ed286c6d8c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -201,20 +201,20 @@ static int pix_fmt_match(enum AVPixelFormat pix_fmt, int components, switch (components) { case 4: - match = match && desc->comp[3].depth_minus1 + 1 >= bpc && + match = match && desc->comp[3].depth >= bpc && (log2_chroma_wh >> 14 & 3) == 0 && (log2_chroma_wh >> 12 & 3) == 0; case 3: - match = match && desc->comp[2].depth_minus1 + 1 >= bpc && + match = match && desc->comp[2].depth >= bpc && (log2_chroma_wh >> 10 & 3) == desc->log2_chroma_w && (log2_chroma_wh >> 8 & 3) == desc->log2_chroma_h; case 2: - match = match && desc->comp[1].depth_minus1 + 1 >= bpc && + match = match && desc->comp[1].depth >= bpc && (log2_chroma_wh >> 6 & 3) == desc->log2_chroma_w && (log2_chroma_wh >> 4 & 3) == desc->log2_chroma_h; case 1: - match = match && desc->comp[0].depth_minus1 + 1 >= bpc && + match = match && desc->comp[0].depth >= bpc && (log2_chroma_wh >> 2 & 3) == 0 && (log2_chroma_wh & 3) == 0 && (desc->flags & AV_PIX_FMT_FLAG_PAL) == pal8 * AV_PIX_FMT_FLAG_PAL; -- cgit v1.2.3