Merge pull request #2703 from ace20022/cores_revised

[vuplus_xbmc] / xbmc / cores / dvdplayer / DVDCodecs / Video / DXVA.cpp

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
index f0a1b16..506b017 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://www.xbmc.org
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -447,6 +447,15 @@ static bool CheckCompatibility(AVCodecContext *avctx)
     return false;
   }
 
+  // DXVA has this as a max resolution
+  if(avctx->width  >= 1920
+  || avctx->height >= 1088)
+  {
+    CLog::Log(LOGDEBUG, "DXVA - frame size (%dx%d) too large - disallowing", avctx->width, avctx->height);
+    return false;
+  }
+
+
   // Check for hardware limited to H264 L4.1 (ie Bluray).
 
   // No advanced settings: autodetect.