From: Anton Mitrofanov <BugMaster@narod.ru>
Date: Tue, 6 Mar 2012 13:34:02 +0000 (+0400)
Subject: Fix RGB colorspace input
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fc5acc6e6c038f6380f614e4dc4e1893b716b7e;p=libx264

Fix RGB colorspace input
BGR/BGRA input was correct.
---

diff --git a/common/frame.c b/common/frame.c
index 820e09d0..e13e5097 100644
--- a/common/frame.c
+++ b/common/frame.c
@@ -366,9 +366,9 @@ int x264_frame_copy_picture( x264_t *h, x264_frame_t *dst, x264_picture_t *src )
              pix[0] += (h->param.i_height-1) * stride[0];
              stride[0] = -stride[0];
          }
-         int b = i_csp==X264_CSP_RGB ? 2 : 0;
-         h->mc.plane_copy_deinterleave_rgb( dst->plane[1], dst->i_stride[1],
-                                            dst->plane[b], dst->i_stride[b],
+         int b = i_csp==X264_CSP_RGB;
+         h->mc.plane_copy_deinterleave_rgb( dst->plane[1+b], dst->i_stride[1+b],
+                                            dst->plane[0], dst->i_stride[0],
                                             dst->plane[2-b], dst->i_stride[2-b],
                                             (pixel*)pix[0], stride[0]/sizeof(pixel), i_csp==X264_CSP_BGRA ? 4 : 3, h->param.i_width, h->param.i_height );
     }