generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-03-29 04:54:57 +02:00
parent 9aeacc9546 b678dd9690
commit aebce0b0fa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/libopenjpegdec.c
View File

@@ -266,7 +266,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
avcodec_set_dimensions(avctx, width, height); avcodec_set_dimensions(avctx, width, height);
switch (image->numcomps) { 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; break;
case 2: avctx->pix_fmt = PIX_FMT_GRAY8A; case 2: avctx->pix_fmt = PIX_FMT_GRAY8A;
break; break;