Commit aebce0b0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder

* git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder:
  Fixes ticket 1127. I'm still looking into why bpp is getting set to 0.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9aeacc95 b678dd96
......@@ -266,7 +266,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
avcodec_set_dimensions(avctx, width, height);
switch (image->numcomps) {
case 1: avctx->pix_fmt = (image->comps[0].bpp == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16;
case 1: avctx->pix_fmt = (image->comps[0].prec == 8) ? PIX_FMT_GRAY8 : PIX_FMT_GRAY16;
break;
case 2: avctx->pix_fmt = PIX_FMT_GRAY8A;
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment