aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpopcornmix <popcornmix@gmail.com>2014-12-01 22:07:25 +0000
committerpopcornmix <popcornmix@gmail.com>2014-12-02 11:32:01 +0000
commit5cc07489392e3b51dc8ca60e51f87800f21dad58 (patch)
tree140b1e7520beff70c2f89ca6654ac0b28a8ed31b
parentb2284e5562ed7f3f951e4fe7102d39288d1895d3 (diff)
[omxplayer] Fix precedence in deinterlace resolution check
-rw-r--r--xbmc/cores/omxplayer/OMXVideo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
index 45e942f488..99bb7eb15f 100644
--- a/xbmc/cores/omxplayer/OMXVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXVideo.cpp
@@ -257,7 +257,7 @@ bool COMXVideo::PortSettingsChanged()
if(m_deinterlace)
{
EINTERLACEMETHOD interlace_method = g_renderManager.AutoInterlaceMethod(CMediaSettings::Get().GetCurrentVideoSettings().m_InterlaceMethod);
- bool advanced_deinterlace = interlace_method == VS_INTERLACEMETHOD_MMAL_ADVANCED || interlace_method == VS_INTERLACEMETHOD_MMAL_ADVANCED_HALF &&
+ bool advanced_deinterlace = (interlace_method == VS_INTERLACEMETHOD_MMAL_ADVANCED || interlace_method == VS_INTERLACEMETHOD_MMAL_ADVANCED_HALF) &&
port_image.format.video.nFrameWidth * port_image.format.video.nFrameHeight <= 576 * 720;
bool half_framerate = interlace_method == VS_INTERLACEMETHOD_MMAL_ADVANCED_HALF || interlace_method == VS_INTERLACEMETHOD_MMAL_BOB_HALF;
if (!advanced_deinterlace)