summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lajos Molnar <lajos@google.com> 2014-09-09 21:55:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-09 21:55:43 +0000
commitbc67eee7106df735d69cc4b4939605ef19b9c881 (patch)
tree52a343040a70b004c9f4067bb0855517b8fd1cde
parent3ab7bf1a3d1383190a8c3a84f1216227529fdcec (diff)
parentaa79d9957652af446d01d5e72afd11a44f7e91ed (diff)
Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
-rw-r--r--media/java/android/media/MediaCodecList.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodecList.java b/media/java/android/media/MediaCodecList.java
index 85e9b1654a65..0dcbd6528783 100644
--- a/media/java/android/media/MediaCodecList.java
+++ b/media/java/android/media/MediaCodecList.java
@@ -118,6 +118,7 @@ final public class MediaCodecList {
/** @hide */
public static MediaCodecInfo getInfoFor(String codec) {
+ initCodecList();
return sAllCodecInfos[findCodecByName(codec)];
}