diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-12-01 22:36:57 +0100 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-12-01 22:36:57 +0100 |
| commit | ffad6b854d2c68b6cbeb5a29f8f1bb7ca461444e (patch) | |
| tree | 56a9d2ede2120569d2e62d776f8f1cf32f061263 | |
| parent | 60c5037e21ce93873ae4478cf6863f941773313e (diff) | |
| parent | b541e159801eb4802bb3e48f064db17200c26201 (diff) | |
Merge pull request #5859 from popcornmix/omxplayer_disable
FIX: actually disable omxplayer if software is selected
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDPlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index b6bcb8d066..abc407d131 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -575,7 +575,7 @@ CDVDPlayer::CDVDPlayer(IPlayerCallback& callback) m_OmxPlayerState.current_deinterlace = CMediaSettings::Get().GetCurrentVideoSettings().m_DeinterlaceMode; m_OmxPlayerState.interlace_method = VS_INTERLACEMETHOD_MAX; #ifdef HAS_OMXPLAYER - m_omxplayer_mode = CSettings::Get().GetBool("videoplayer.useomxplayer"); + m_omxplayer_mode = (EDECODEMETHOD)CSettings::Get().GetInt("videoplayer.decodingmethod") == VS_DECODEMETHOD_HARDWARE && CSettings::Get().GetBool("videoplayer.useomxplayer"); #else m_omxplayer_mode = false; #endif |