commit 01c9654a678d6ff08a8cbf2565bef712b402a8af
author The Android Automerger <android-build@google.com> Wed Feb 11 06:11:27 2015 -0800
committer The Android Automerger <android-build@google.com> Wed Feb 11 06:11:27 2015 -0800
tree b6be863f1faff7b11bf27880d4a7334b95d8f4b0
parent ced69386c75e4fdcdb58edab60328d1d0829c4cf
parent ccf1a55c805e851359c8e50ec67ca3a8556010f7

merge in lmp-mr1-release history after reset to lmp-mr1-dev

videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp

diff --git a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
index 4260f30..029484c 100644
--- a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
+++ b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
@@ -472,10 +472,6 @@
             return DECODE_FAIL;
         }
         VTRACE("picData->num_slices = %d", picData->num_slices);
-        if ((picData->num_slices > 1) && mModularMode) {
-            ETRACE("MDRM multi-slice not supported yet!");
-            return DECODE_PARSER_FAIL;
-	}
         for (uint32_t sliceIndex = 0; sliceIndex < picData->num_slices; sliceIndex++) {
             status = decodeSlice(data, picIndex, sliceIndex);
             if (status != DECODE_SUCCESS) {