commit 4f70ca7f2c92a61b969ed7f2bed7a6f2161ff5fe
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 08 09:23:38 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Oct 08 09:23:38 2012 -0700
tree 7d5322dc77014d1f93bba87d72eab536e6059796
parent ae5bd81856a7f162403757c58eaa74badf5110f8
parent 9105d4246637072b7cc9fe4a30cedf7889101324

Merge "msm: vidc: Adds fix to set the correct MPEG4 profile"

drivers/media/video/msm_vidc/vidc_hal_api.h

diff --git a/drivers/media/video/msm_vidc/vidc_hal_api.h b/drivers/media/video/msm_vidc/vidc_hal_api.h
index 659cf7e..879418d 100644
--- a/drivers/media/video/msm_vidc/vidc_hal_api.h
+++ b/drivers/media/video/msm_vidc/vidc_hal_api.h
@@ -210,7 +210,7 @@
 
 enum hal_mpeg4_profile {
 	HAL_MPEG4_PROFILE_SIMPLE           = 0x00000001,
-	HAL_MPEG4_PROFILE_SIMPLESCALABLE   = 0x00000002,
+	HAL_MPEG4_PROFILE_ADVANCEDSIMPLE   = 0x00000002,
 	HAL_MPEG4_PROFILE_CORE             = 0x00000004,
 	HAL_MPEG4_PROFILE_MAIN             = 0x00000008,
 	HAL_MPEG4_PROFILE_NBIT             = 0x00000010,
@@ -224,7 +224,7 @@
 	HAL_MPEG4_PROFILE_ADVANCEDCODING   = 0x00001000,
 	HAL_MPEG4_PROFILE_ADVANCEDCORE     = 0x00002000,
 	HAL_MPEG4_PROFILE_ADVANCEDSCALABLE = 0x00004000,
-	HAL_MPEG4_PROFILE_ADVANCEDSIMPLE   = 0x00008000,
+	HAL_MPEG4_PROFILE_SIMPLESCALABLE   = 0x00008000,
 	HAL_UNUSED_MPEG4_PROFILE = 0x10000000,
 };