commit e4c7ec847d83edfb54c215f3ab6093efeb17a586
author Greg Hackmann <ghackmann@google.com> Fri Nov 21 20:27:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 21 20:27:08 2014 +0000
tree 1ca5a1bc495686f687ea10df56e89db6f679f567
parent a63caa1983138e561b2b033c5d178636beeb1578
parent e80d32c3c2ec4f2acc917c92c9c943e81de80496

Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev

include/media/openmax/OMX_AsString.h

diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
index 18e1e52..0f177a1 100644
--- a/include/media/openmax/OMX_AsString.h
+++ b/include/media/openmax/OMX_AsString.h
@@ -520,7 +520,7 @@
         case OMX_IndexParamVideoAndroidVp8Encoder:      return "ParamVideoAndroidVp8Encoder";
         case OMX_IndexParamVideoHevc:                   return "ParamVideoHevc";
 //      case OMX_IndexParamSliceSegments:               return "ParamSliceSegments";
-//      case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";
+        case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";
         default:                                        return asString((OMX_INDEXTYPE)i, def);
     }
 }

include/media/openmax/OMX_IndexExt.h

diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h
index 6cd774b..699efcb 100644
--- a/include/media/openmax/OMX_IndexExt.h
+++ b/include/media/openmax/OMX_IndexExt.h
@@ -81,6 +81,7 @@
 
     /* Other configurations */
     OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000,
+    OMX_IndexConfigAutoFramerateConversion,         /**< reference: OMX_CONFIG_BOOLEANTYPE */
 
     /* Time configurations */
     OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,