diff options
| author | Arne Coucheron <arco68@gmail.com> | 2013-08-11 00:40:12 +0200 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2014-11-11 00:16:16 -0800 |
| commit | 8bc06c28325a0c9b2e97ea5baf0f3548255f7bb3 (patch) | |
| tree | b99863c7d53d16a4a1485092b70469705b48bf19 | |
| parent | a4e6ec3f02324cd33337555f25fe86f8c0d6f7bf (diff) | |
| download | android_hardware_qcom_media-8bc06c28325a0c9b2e97ea5baf0f3548255f7bb3.tar.gz android_hardware_qcom_media-8bc06c28325a0c9b2e97ea5baf0f3548255f7bb3.tar.bz2 android_hardware_qcom_media-8bc06c28325a0c9b2e97ea5baf0f3548255f7bb3.zip | |
mm-core: Remove double declaration of OMX.qcom.audio.decoder.aac
Change-Id: I0d64cde98ab92c48fe9e70d26724c334f22a79f6
| -rw-r--r-- | mm-core/src/8960/qc_registry_table_android.c | 18 | ||||
| -rw-r--r-- | mm-core/src/8974/qc_registry_table.c | 16 | ||||
| -rw-r--r-- | mm-core/src/8974/qc_registry_table_android.c | 18 |
3 files changed, 2 insertions, 50 deletions
diff --git a/mm-core/src/8960/qc_registry_table_android.c b/mm-core/src/8960/qc_registry_table_android.c index c739c529..3e0124de 100644 --- a/mm-core/src/8960/qc_registry_table_android.c +++ b/mm-core/src/8960/qc_registry_table_android.c @@ -456,23 +456,7 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { + { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle diff --git a/mm-core/src/8974/qc_registry_table.c b/mm-core/src/8974/qc_registry_table.c index 1e4577c3..e1ec32ac 100644 --- a/mm-core/src/8974/qc_registry_table.c +++ b/mm-core/src/8974/qc_registry_table.c @@ -408,22 +408,6 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function diff --git a/mm-core/src/8974/qc_registry_table_android.c b/mm-core/src/8974/qc_registry_table_android.c index b1cc523b..bb6b458c 100644 --- a/mm-core/src/8974/qc_registry_table_android.c +++ b/mm-core/src/8974/qc_registry_table_android.c @@ -424,23 +424,7 @@ omx_core_cb_type core[] = "audio_encoder.amrnb" } }, - { - "OMX.qcom.audio.decoder.aac", - NULL, // Create instance function - // Unique instance handle - { - NULL, - NULL, - NULL, - NULL - }, - NULL, // Shared object library handle - "libOmxAacDec.so", - { - "audio_decoder.aac" - } - }, - { + { "OMX.qcom.audio.decoder.multiaac", NULL, // Create instance function // Unique instance handle |