From 060ea5261df52ff1ce20e87d1ddd0645fc58c2ca Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 3 Dec 2018 23:34:05 +0100 Subject: [PATCH] avcodec/r210dec: fix r10x decoding --- libavcodec/r210dec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index 22b95e9..407684c 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -73,10 +73,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } else { pixel = av_be2ne32(*src++); } - if (avctx->codec_id == AV_CODEC_ID_R210 || r10) { + if (avctx->codec_id == AV_CODEC_ID_R210) { b = pixel & 0x3ff; g = (pixel >> 10) & 0x3ff; r = (pixel >> 20) & 0x3ff; + } else if (r10) { + r = pixel & 0x3ff; + g = (pixel >> 10) & 0x3ff; + b = (pixel >> 20) & 0x3ff; } else { b = (pixel >> 2) & 0x3ff; g = (pixel >> 12) & 0x3ff; -- 2.7.4