summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-08-12 17:05:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-12 16:54:46 +0000
commitd018b8ffd84452a7a4b992b5325713b3256e48ff (patch)
treea338c848af9b637f9879a7f0293d0fafbfef4489 /include
parent2461e0cf6ae3fe5c9b52ce9e3ac764f4aff5e5eb (diff)
parent6ff58f04f78886b07c72c0118eb71a78d08f5651 (diff)
downloadframeworks_av-d018b8ffd84452a7a4b992b5325713b3256e48ff.zip
frameworks_av-d018b8ffd84452a7a4b992b5325713b3256e48ff.tar.gz
frameworks_av-d018b8ffd84452a7a4b992b5325713b3256e48ff.tar.bz2
Merge "MediaCodecList: handle errors gracefully" into lmp-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/MediaCodecInfo.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/MediaCodecInfo.h b/include/media/MediaCodecInfo.h
index b4916af..ab7a4b8 100644
--- a/include/media/MediaCodecInfo.h
+++ b/include/media/MediaCodecInfo.h
@@ -107,6 +107,7 @@ private:
status_t initializeCapabilities(const CodecCapabilities &caps);
void addDetail(const AString &key, const AString &value);
void addFeature(const AString &key, int32_t value);
+ void removeMime(const char *mime);
void complete();
DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);