avcodec/r210dec: fix r10x decoding

060ea526 · Paul B Mahol · 5487560a · 060ea526
Commit 060ea526 authored Dec 03, 2018 by Paul B Mahol
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

r210dec.c libavcodec/r210dec.c +5 -1

No files found.
--- 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;