commit be44e0e0ffda04725c4864d894a7cc80bd74b5ca
author Elliott Hughes <enh@google.com> Thu Jul 10 00:08:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 10 00:08:21 2014 +0000
tree 49fa92bcc9b51b04b307b8fa6bb909e5ac387109
parent 1c1b5e51cb1acd43984ce2e82a27e61b4943186a
parent 0bffd2e60f644c8b8650c48d320c8cc22deb8ab6

am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."

* commit '0bffd2e60f644c8b8650c48d320c8cc22deb8ab6':
  Switch frameworks/av/media/libmedia to the new icu.

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;
         }