Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'

[ffmpeg] / libavcodec / r210enc.c

diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c
index d61cd757e8948558cb5ddb56420101737a055d9e..07dfc50bf0cf0a325a9d3d8238a4467d70cd93dd 100644 (file)
--- a/libavcodec/r210enc.c
+++ b/libavcodec/r210enc.c
@@ -58,11 +58,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
             uint32_t pixel;
             uint16_t r = *src++ >> 6;
             uint16_t g = *src++ >> 6;
-            uint16_t b = *src++ >> 4;
+            uint16_t b = *src++ >> 6;
             if (avctx->codec_id == AV_CODEC_ID_R210)
-                pixel = (r << 20) | (g << 10) | b >> 2;
+                pixel = (r << 20) | (g << 10) | b;
             else
-                pixel = (r << 22) | (g << 12) | b;
+                pixel = (r << 22) | (g << 12) | (b << 2);
             if (avctx->codec_id == AV_CODEC_ID_AVRP)
                 bytestream_put_le32(&dst, pixel);
             else