summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-02 06:36:29 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-02 06:36:29 -0800
commitfa814875544edf827ca3b4f7287268930ba6dcc7 (patch)
tree6325bdbe6694ad336698ea707117157e23fdb660
parent759631357d28e4108db0bcacb5a1f9ff79723688 (diff)
parent123169074ebbf7ef3ac4b3137acdbfe8ecbc3bd4 (diff)
downloadandroid_hardware_qcom_media-fa814875544edf827ca3b4f7287268930ba6dcc7.tar.gz
android_hardware_qcom_media-fa814875544edf827ca3b4f7287268930ba6dcc7.tar.bz2
android_hardware_qcom_media-fa814875544edf827ca3b4f7287268930ba6dcc7.zip
Merge "mm-core: msm8953: Restore avc secure encoder"
-rw-r--r--mm-core/src/msm8953/registry_table_android.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/mm-core/src/msm8953/registry_table_android.c b/mm-core/src/msm8953/registry_table_android.c
index 21723c24..5c563772 100644
--- a/mm-core/src/msm8953/registry_table_android.c
+++ b/mm-core/src/msm8953/registry_table_android.c
@@ -335,6 +335,19 @@ omx_core_cb_type core[] =
}
},
{
+ "OMX.qcom.video.encoder.avc.secure",
+ NULL, // Create instance function
+ // Unique instance handle
+ {
+ NULL
+ },
+ NULL, // Shared object library handle
+ "libOmxVenc.so",
+ {
+ "video_encoder.avc"
+ }
+ },
+ {
"OMX.qcom.video.encoder.vp8",
NULL, // Create instance function
// Unique instance handle
@@ -704,19 +717,6 @@ omx_core_cb_type core[] =
}
},
{
- "OMX.qcom.video.encoder.avc.secure",
- NULL, // Create instance function
- // Unique instance handle
- {
- NULL
- },
- NULL, // Shared object library handle
- "libOmxVenc.so",
- {
- "video_encoder.avc"
- }
- },
- {
"OMX.qcom.audio.decoder.aac",
NULL, // Create instance function
// Unique instance handle