aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libopenjpegdec.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-03-25 23:31:31 +0000
committerMichael Niedermayer <michaelni@gmx.at>2012-03-27 00:48:27 +0200
commita65016205f46d74aa631904ba72a8c70fe32258c (patch)
treeeb8c83c22ea445bc44117a697d68f2463595bc56 /libavcodec/libopenjpegdec.c
parentd6eef545c1f576d798a8f07fbcec5cdfb2d950f6 (diff)
downloadandroid_external_ffmpeg-a65016205f46d74aa631904ba72a8c70fe32258c.tar.gz
android_external_ffmpeg-a65016205f46d74aa631904ba72a8c70fe32258c.tar.bz2
android_external_ffmpeg-a65016205f46d74aa631904ba72a8c70fe32258c.zip
libopenjpegdec: hack to fix GRAY16 decoding
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
-rw-r--r--libavcodec/libopenjpegdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index d6a381c76e..2744713a8a 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -106,6 +106,10 @@ libopenjpeg_rgb:
static inline int libopenjpeg_ispacked(enum PixelFormat pix_fmt) {
int i, component_plane;
+
+ if (pix_fmt == PIX_FMT_GRAY16)
+ return 0;
+
component_plane = av_pix_fmt_descriptors[pix_fmt].comp[0].plane;
for(i = 1; i < av_pix_fmt_descriptors[pix_fmt].nb_components; i++) {
if (component_plane != av_pix_fmt_descriptors[pix_fmt].comp[i].plane)