summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-11-14 19:19:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-14 19:19:40 +0000
commitaedb1c843e9a1d3149ca81d586fa168d146d8f5e (patch)
treed234c71076cbe0ddfb430cd8372ccdd631d89cf8 /include/media
parentcc7432254e2569c2c8ddeeef2083cf2b43871730 (diff)
parent5d07648b367319b2da322acc58e3e6157bf912f2 (diff)
downloadframeworks_native-aedb1c843e9a1d3149ca81d586fa168d146d8f5e.zip
frameworks_native-aedb1c843e9a1d3149ca81d586fa168d146d8f5e.tar.gz
frameworks_native-aedb1c843e9a1d3149ca81d586fa168d146d8f5e.tar.bz2
am 5d07648b: am 26653bad: Fix build.
* commit '5d07648b367319b2da322acc58e3e6157bf912f2': Fix build.
Diffstat (limited to 'include/media')
-rw-r--r--include/media/openmax/OMX_AsString.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
index 0f177a1..18e1e52 100644
--- a/include/media/openmax/OMX_AsString.h
+++ b/include/media/openmax/OMX_AsString.h
@@ -520,7 +520,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") {
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);
}
}