diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 15:43:03 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 16:35:28 +0200 |
| commit | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (patch) | |
| tree | 866bd99edecd778aee4cd8eb5f34977d0c82a27d /libavcodec/libopenjpegdec.c | |
| parent | f53569a93f853057d4852601b547a1d9c57613b6 (diff) | |
| parent | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff) | |
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 644e06c4cc..01ff48ce32 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -114,22 +114,22 @@ static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum AVP switch (desc->nb_components) { case 4: match = match && - desc->comp[3].depth_minus1 + 1 >= image->comps[3].prec && + desc->comp[3].depth >= image->comps[3].prec && 1 == image->comps[3].dx && 1 == image->comps[3].dy; case 3: match = match && - desc->comp[2].depth_minus1 + 1 >= image->comps[2].prec && + desc->comp[2].depth >= image->comps[2].prec && 1 << desc->log2_chroma_w == image->comps[2].dx && 1 << desc->log2_chroma_h == image->comps[2].dy; case 2: match = match && - desc->comp[1].depth_minus1 + 1 >= image->comps[1].prec && + desc->comp[1].depth >= image->comps[1].prec && 1 << desc->log2_chroma_w == image->comps[1].dx && 1 << desc->log2_chroma_h == image->comps[1].dy; case 1: match = match && - desc->comp[0].depth_minus1 + 1 >= image->comps[0].prec && + desc->comp[0].depth >= image->comps[0].prec && 1 == image->comps[0].dx && 1 == image->comps[0].dy; default: @@ -388,7 +388,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, } desc = av_pix_fmt_desc_get(avctx->pix_fmt); - pixel_size = desc->comp[0].step_minus1 + 1; + pixel_size = desc->comp[0].step; ispacked = libopenjpeg_ispacked(avctx->pix_fmt); switch (pixel_size) { |