summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorStefan _ <sfan5@live.de>2018-03-06 22:19:36 +0000
committerMatthieu Bouron <matthieu.bouron@gmail.com>2018-03-07 13:52:02 +0100
commit5ab0ecf2830fd7a864bb21f7fe247594872932fa (patch)
tree598c8c2c2a8a780429d2d8b63650db3ef2b41eb0 /libavcodec
parenta43e9cdd442b3ccf50faa32a15b03bdaff278017 (diff)
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'.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mediacodec_wrapper.c2
1 files changed, 1 insertions, 1 deletions
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;