diff options
| author | Andreas Huber <andih@google.com> | 2011-05-12 13:40:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-12 13:40:37 -0700 |
| commit | b84d042a1216694e1db6b1fc2b053d348cab5593 (patch) | |
| tree | 91389f3009ebebfbac998fd3d1c77a3d6f67d57e | |
| parent | 00f4951088805442e86ff9c2a20ddad79fc2410a (diff) | |
| parent | 9f753df58a70f20db220af31cb202bbd21b30f36 (diff) | |
| download | frameworks_av-b84d042a1216694e1db6b1fc2b053d348cab5593.zip frameworks_av-b84d042a1216694e1db6b1fc2b053d348cab5593.tar.gz frameworks_av-b84d042a1216694e1db6b1fc2b053d348cab5593.tar.bz2 | |
Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."
| -rw-r--r-- | media/libstagefright/SampleTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t SampleTable::setSampleSizeParams( return ERROR_MALFORMED; } - mSampleSizeFieldSize = mDefaultSampleSize & 0xf; + mSampleSizeFieldSize = mDefaultSampleSize & 0xff; mDefaultSampleSize = 0; if (mSampleSizeFieldSize != 4 && mSampleSizeFieldSize != 8 |