commit 380d1e1abff2bbcba45d452e37f9699792422c08
author Lajos Molnar <lajos@google.com> Thu Jul 17 00:21:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 17 00:21:02 2014 +0000
tree 030c229a80e023647a7f22edb5c3f0e292d187a9
parent 9b2ccd681c4624bb3a16fb6d80f16024528c8d22
parent 2e25819fffbb23d42541ead1bf735f3a02fa0330

am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"

* commit '2e25819fffbb23d42541ead1bf735f3a02fa0330':
  M3UParser: check for NULL before setting meta data

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