mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-18 15:25:05 +02:00
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Respect horizontal differencing predictor for 16bit gray tiff images. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
dffc16d523
@ -1293,6 +1293,8 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
ssize = s->width * soff;
|
||||
if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_GRAY16LE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_YA16LE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_GBRP16LE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16LE) {
|
||||
for (i = 0; i < s->height; i++) {
|
||||
@ -1302,6 +1304,8 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
}
|
||||
} else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_GRAY16BE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_YA16BE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_GBRP16BE ||
|
||||
s->avctx->pix_fmt == AV_PIX_FMT_GBRAP16BE) {
|
||||
for (i = 0; i < s->height; i++) {
|
||||
|
Loading…
Reference in New Issue
Block a user