commit 1c1b5e51cb1acd43984ce2e82a27e61b4943186a
author Narayan Kamath <narayan@google.com> Wed Jul 09 12:22:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 09 12:22:05 2014 +0000
tree 1dfe0b3c77a6f896226a25d01089442d231e51dd
parent 87c47b0d1c2df3e8630eb1b78fe303cfb24b3ad5
parent c37eaa320437b7d65d1c3f704d7b7c61d4ccd8f1

am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"

* commit 'c37eaa320437b7d65d1c3f704d7b7c61d4ccd8f1':
  m4v_h263_enc: Use uint32_t for ULong

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
index 20a7076..eb9fcf7 100644
--- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
+++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
@@ -177,19 +177,18 @@
         {
             OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevel =
                   (OMX_VIDEO_PARAM_PROFILELEVELTYPE *) params;
-            OMX_U32 profileIndex = profileLevel->nProfileIndex;
 
             if (profileLevel->nPortIndex != kInputPortIndex) {
                 ALOGE("Invalid port index: %" PRIu32, profileLevel->nPortIndex);
                 return OMX_ErrorUnsupportedIndex;
             }
 
-            if (profileIndex >= mNumProfileLevels) {
+            if (index >= mNumProfileLevels) {
                 return OMX_ErrorNoMore;
             }
 
-            profileLevel->eProfile = mProfileLevels[profileIndex].mProfile;
-            profileLevel->eLevel   = mProfileLevels[profileIndex].mLevel;
+            profileLevel->eProfile = mProfileLevels[index].mProfile;
+            profileLevel->eLevel   = mProfileLevels[index].mLevel;
             return OMX_ErrorNone;
         }