vlc | branch: master | Martin Storsjö <[email protected]> | Sat Feb 2 15:22:32 2013 +0200| [13618e090e33709f4421bb9526b4dc5793157a8e] | committer: Martin Storsjö
omxil: Use the role names video_decoder.wmv1/2 The role name without a suffix, "video_decoder.wmv", is only for vc1/wmv3/9 (on Samsung Galaxy S III at least). Since certain roles are substrings of others, require the full string to match when looking for suitable codecs instead of using strncmp. Signed-off-by: Martin Storsjö <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13618e090e33709f4421bb9526b4dc5793157a8e --- modules/codec/omxil/omxil.c | 2 +- modules/codec/omxil/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c index e976287..e706090 100644 --- a/modules/codec/omxil/omxil.c +++ b/modules/codec/omxil/omxil.c @@ -169,7 +169,7 @@ static int CreateComponentsList(decoder_t *p_dec, const char *psz_role) for(j = 0; j < roles; j++) { msg_Dbg(p_dec, " - role: %s", ppsz_roles[j]); - if(!strncmp((char *)ppsz_roles[j], psz_role, len)) b_found = true; + if(!strcmp((char *)ppsz_roles[j], psz_role)) b_found = true; } free(ppsz_roles); diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c index 9e11fa4..38d1063 100644 --- a/modules/codec/omxil/utils.c +++ b/modules/codec/omxil/utils.c @@ -303,8 +303,8 @@ static const struct { VLC_CODEC_MP4V, OMX_VIDEO_CodingMPEG4, "video_decoder.mpeg4" }, { VLC_CODEC_H264, OMX_VIDEO_CodingAVC, "video_decoder.avc" }, { VLC_CODEC_H263, OMX_VIDEO_CodingH263, "video_decoder.h263" }, - { VLC_CODEC_WMV1, OMX_VIDEO_CodingWMV, "video_decoder.wmv" }, - { VLC_CODEC_WMV2, OMX_VIDEO_CodingWMV, "video_decoder.wmv" }, + { VLC_CODEC_WMV1, OMX_VIDEO_CodingWMV, "video_decoder.wmv1" }, + { VLC_CODEC_WMV2, OMX_VIDEO_CodingWMV, "video_decoder.wmv2" }, { VLC_CODEC_WMV3, OMX_VIDEO_CodingWMV, "video_decoder.wmv" }, { VLC_CODEC_VC1, OMX_VIDEO_CodingWMV, "video_decoder.wmv" }, { VLC_CODEC_MJPG, OMX_VIDEO_CodingMJPEG, "video_decoder.jpeg" }, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
