commit b84d042a1216694e1db6b1fc2b053d348cab5593
author Andreas Huber <andih@google.com> Thu May 12 13:40:37 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 12 13:40:37 2011 -0700
tree 91389f3009ebebfbac998fd3d1c77a3d6f67d57e
parent 00f4951088805442e86ff9c2a20ddad79fc2410a
parent 9f753df58a70f20db220af31cb202bbd21b30f36

Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index ef4d3d0..eb135ab 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -220,7 +220,7 @@
             return ERROR_MALFORMED;
         }
 
-        mSampleSizeFieldSize = mDefaultSampleSize & 0xf;
+        mSampleSizeFieldSize = mDefaultSampleSize & 0xff;
         mDefaultSampleSize = 0;
 
         if (mSampleSizeFieldSize != 4 && mSampleSizeFieldSize != 8