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/libopenjpegenc.c | |
parent | f53569a93f853057d4852601b547a1d9c57613b6 (diff) | |
parent | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff) | |
download | ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.tar.gz |
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/libopenjpegenc.c')
-rw-r--r-- | libavcodec/libopenjpegenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index d7ba868ae7..0debd24d80 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -189,8 +189,8 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p } for (i = 0; i < numcomps; i++) { - cmptparm[i].prec = desc->comp[i].depth_minus1 + 1; - cmptparm[i].bpp = desc->comp[i].depth_minus1 + 1; + cmptparm[i].prec = desc->comp[i].depth; + cmptparm[i].bpp = desc->comp[i].depth; cmptparm[i].sgnd = 0; cmptparm[i].dx = sub_dx[i]; cmptparm[i].dy = sub_dy[i]; |