diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-27 21:54:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-27 21:54:01 -0800 |
| commit | c001c30149cc28b69b3b3a1e7287396a229f2108 (patch) | |
| tree | 54b35150e19201e78c3923961bec8061ae653f15 | |
| parent | c0dfb6659764fed01b9afa5b206e13973902d35b (diff) | |
| parent | ba4534ba7c26d0822db2cf48faa9b4869b8a0eb1 (diff) | |
| download | android_hardware_qcom_media-c001c30149cc28b69b3b3a1e7287396a229f2108.tar.gz android_hardware_qcom_media-c001c30149cc28b69b3b3a1e7287396a229f2108.tar.bz2 android_hardware_qcom_media-c001c30149cc28b69b3b3a1e7287396a229f2108.zip | |
Merge "mm-video: Recognise "OMX.qcom.video.decoder.divx4" when setting role"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index c4eae14f..0db4c5fd 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -3399,7 +3399,8 @@ OMX_ERRORTYPE omx_vdec::set_parameter(OMX_IN OMX_HANDLETYPE hComp, eRet = OMX_ErrorUnsupportedSetting; } } else if ((!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.divx",OMX_MAX_STRINGNAME_SIZE)) || - (!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.divx311",OMX_MAX_STRINGNAME_SIZE)) + (!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.divx311", OMX_MAX_STRINGNAME_SIZE)) || + (!strncmp(drv_ctx.kind, "OMX.qcom.video.decoder.divx4", OMX_MAX_STRINGNAME_SIZE)) ) { if (!strncmp((const char*)comp_role->cRole,"video_decoder.divx",OMX_MAX_STRINGNAME_SIZE)) { strlcpy((char*)m_cRole,"video_decoder.divx",OMX_MAX_STRINGNAME_SIZE); |