git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bf8d9e
)
avcodec/jpeg2000dec: Fix gain regression with gray16
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Jun 2015 18:26:38 +0000
(20:26 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Jun 2015 18:26:38 +0000
(20:26 +0200)
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/jpeg2000dec.c
b/libavcodec/jpeg2000dec.c
index
aecc6eb
..
24cb8a1
100644
(file)
--- a/
libavcodec/jpeg2000dec.c
+++ b/
libavcodec/jpeg2000dec.c
@@
-1330,7
+1330,8
@@
static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile,
}
}
} else {
- int precision = picture->format == AV_PIX_FMT_XYZ12 ? 16 : s->precision;
+ int precision = picture->format == AV_PIX_FMT_XYZ12 ||
+ picture->format == AV_PIX_FMT_GRAY16 ? 16 : s->precision;
for (compno = 0; compno < s->ncomponents; compno++) {
Jpeg2000Component *comp = tile->comp + compno;