vlc | branch: master | Thomas Guillem <[email protected]> | Fri Mar 13 18:27:32 
2015 +0100| [dd9c3f047322bfb0771cbb45825a1f0117e441c4] | committer: 
Jean-Baptiste Kempf

mediacodec: don't use MTK MPEG4 decoders

Fix a crash with android mediaserver

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd9c3f047322bfb0771cbb45825a1f0117e441c4
---

 modules/codec/omxil/android_mediacodec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/codec/omxil/android_mediacodec.c 
b/modules/codec/omxil/android_mediacodec.c
index 114b648..2840494 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -444,6 +444,8 @@ static int OpenDecoder(vlc_object_t *p_this)
 
         if (!strncmp(name_ptr, "OMX.google.", __MIN(11, name_len)))
             goto loopclean;
+        if (!strncmp(name_ptr, "OMX.MTK.VIDEO.DECODER.MPEG4", name_len))
+            goto loopclean;
         for (int j = 0; j < num_types && !found; j++) {
             jobject type = (*env)->GetObjectArrayElement(env, types, j);
             if (!jstrcmp(env, type, mime)) {

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to