diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 04:54:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-29 04:55:58 +0200 |
| commit | aebce0b0fa40c7ce7ac31eabe1d16c72c6d4a035 (patch) | |
| tree | 9e14bfbaf6c3d70ee6f0de253507f191ff78ac5d /libavcodec | |
| parent | 9aeacc95461750c2161ef4fecbbb3323bcd340fb (diff) | |
| parent | b678dd9690662c8041df90f4d0873927abf31372 (diff) | |
| download | ffmpeg-aebce0b0fa40c7ce7ac31eabe1d16c72c6d4a035.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 2744713a8a..744b4e2ffa 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -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; |