diff options
| author | Michael Bradshaw <mbradshaw@sorensonmedia.com> | 2012-03-28 10:22:49 -0600 |
|---|---|---|
| committer | Michael Bradshaw <mbradshaw@sorensonmedia.com> | 2012-03-28 16:27:08 -0600 |
| commit | b678dd9690662c8041df90f4d0873927abf31372 (patch) | |
| tree | 03b65f65d61419880b1e9679a0fa8bdc3e8f59b6 /libavcodec/libopenjpegdec.c | |
| parent | 99bb88c588ea9a46a06b966b9014394385ebe1c3 (diff) | |
| download | android_external_ffmpeg-b678dd9690662c8041df90f4d0873927abf31372.tar.gz android_external_ffmpeg-b678dd9690662c8041df90f4d0873927abf31372.tar.bz2 android_external_ffmpeg-b678dd9690662c8041df90f4d0873927abf31372.zip | |
Fixes ticket 1127.
I'm still looking into why bpp is getting set to 0.
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
| -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; |