commit 8f77b413e8a31e508859e9cc257c9543a5b7887d
author James Dong <jdong@google.com> Mon Feb 28 11:27:09 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 28 11:27:09 2011 -0800
tree 8f9968cdc1de666a9da458714e1ce20156ab6c5a
parent fbaa6741b61cffa5db8ad843fd4e3cf07ff0b31a
parent 94738e40c2db7d0197838ca81831dd26ca4dc01b

Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4."

media/libstagefright/colorconversion/ColorConverter.cpp

diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index d518c97..3b92e5d 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -187,7 +187,7 @@
 
 status_t ColorConverter::convertYUV420Planar(
         const BitmapParams &src, const BitmapParams &dst) {
-    if (!((dst.mWidth & 3) == 0
+    if (!((dst.mWidth & 1) == 0
             && (src.mCropLeft & 1) == 0
             && src.cropWidth() == dst.cropWidth()
             && src.cropHeight() == dst.cropHeight())) {