aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfritsch <Peter.Fruehberger@gmail.com>2015-04-09 20:17:39 +0200
committerfritsch <Peter.Fruehberger@gmail.com>2015-04-11 11:01:27 +0200
commit7a0c0c96ff6f474cb07634d61e4a9ea35645ffbc (patch)
tree5435bd9d2a5d3abdf65cc59eb43136be5279d30a
parentaa6d4be8c0499adcde65339f7dfda25ef4d3a807 (diff)
IMX: Only fallback to ffmpeg for AVC with level 3.0 - others are fine
-rw-r--r--xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
index 0496c12620..2917208e57 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp
@@ -516,9 +516,9 @@ bool CDVDVideoCodecIMX::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options)
{
// Test for VPU unsupported profiles to revert to sw decoding
if ((m_hints.profile == 110) || //hi10p
- (m_hints.profile == 578)) //quite uncommon h264 profile
+ (m_hints.profile == 578 && m_hints.level == 30)) //quite uncommon h264 profile with Main 3.0
{
- CLog::Log(LOGNOTICE, "i.MX6 VPU is not able to decode AVC profile %d", m_hints.profile);
+ CLog::Log(LOGNOTICE, "i.MX6 VPU is not able to decode AVC profile %d level %d", m_hints.profile, m_hints.level);
return false;
}
m_decOpenParam.CodecFormat = VPU_V_AVC;