From 5ab0ecf2830fd7a864bb21f7fe247594872932fa Mon Sep 17 00:00:00 2001 From: Stefan _ Date: Tue, 6 Mar 2018 22:19:36 +0000 Subject: [PATCH] avcodec/mediacodec_wrapper: fix false positives in swdec blacklist 'OMX.SEC.avc.dec' is a valid hardware decoder, while the decoders we seek to blacklist all match 'OMX.SEC.*.sw.dec'. --- libavcodec/mediacodec_wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index 83811281a5..11d7f665c7 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -473,7 +473,7 @@ char *ff_AMediaCodecList_getCodecNameByType(const char *mime, int profile, int e if ( strstr(name, "OMX.google") || strstr(name, "OMX.ffmpeg") || - strstr(name, "OMX.SEC") || + (strstr(name, "OMX.SEC") && strstr(name, ".sw.")) || !strcmp(name, "OMX.qcom.video.decoder.hevcswvdec")) { av_freep(&name); goto done_with_type;