summaryrefslogtreecommitdiff
authorTellen Yu <tellen.yu@amlogic.com>2017-10-30 05:40:50 (GMT)
committer Gerrit Code Review <gituser@scgit.amlogic.com>2017-10-30 05:40:50 (GMT)
commit31cb9101538f7b02a1980b99a19576f5f976b707 (patch)
treeac4397665a2f853f8ab22cf3542c852a718fdb2c
parentea1d3ccb5c160fcb4743d71268369d47a01f43fa (diff)
parent90868ae455557a49c320dac8a1cdbc29a0b5b76d (diff)
downloadamlogic-o-31cb9101538f7b02a1980b99a19576f5f976b707.zip
amlogic-o-31cb9101538f7b02a1980b99a19576f5f976b707.tar.gz
amlogic-o-31cb9101538f7b02a1980b99a19576f5f976b707.tar.bz2
Merge "omx: supports-secure-with-non-secure-codec true [1/2]" into o-amlogic
Diffstat
-rw-r--r--p212/files/media_codecs.xml2
-rw-r--r--p230/files/media_codecs.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/p212/files/media_codecs.xml b/p212/files/media_codecs.xml
index aceb35c..0654351 100644
--- a/p212/files/media_codecs.xml
+++ b/p212/files/media_codecs.xml
@@ -279,7 +279,7 @@ Only the three quirks included above are recognized at this point:
<Settings>
<Setting name="max-video-encoder-input-buffers" value="9" />
<Setting name="supports-multiple-secure-codecs" value="false" />
- <Setting name="supports-secure-with-non-secure-codec" value="false" />
+ <Setting name="supports-secure-with-non-secure-codec" value="true" />
</Settings>
<Encoders>
diff --git a/p230/files/media_codecs.xml b/p230/files/media_codecs.xml
index aceb35c..0654351 100644
--- a/p230/files/media_codecs.xml
+++ b/p230/files/media_codecs.xml
@@ -279,7 +279,7 @@ Only the three quirks included above are recognized at this point:
<Settings>
<Setting name="max-video-encoder-input-buffers" value="9" />
<Setting name="supports-multiple-secure-codecs" value="false" />
- <Setting name="supports-secure-with-non-secure-codec" value="false" />
+ <Setting name="supports-secure-with-non-secure-codec" value="true" />
</Settings>
<Encoders>