[chd/vda] SD content -> ffmpeg HD content -> chd/vda

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31863 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index e0a4741..c77897b 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -171,7 +171,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec( CDVDStreamInfo &hint )
     if( (pCodec = OpenCodec(new CDVDVideoCodecLibMpeg2(), hint, options)) ) return pCodec;
   }
 #if defined(HAVE_LIBVDADECODER)
-  if (g_sysinfo.HasVDADecoder())
+  if (hint.width > 720 && g_sysinfo.HasVDADecoder())
   {
     if (g_guiSettings.GetBool("videoplayer.usevda") && !hint.software && hint.codec == CODEC_ID_H264)
     {
@@ -182,13 +182,9 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec( CDVDStreamInfo &hint )
 #endif
 
 #if defined(HAVE_LIBCRYSTALHD)
-  if (g_guiSettings.GetBool("videoplayer.usechd") && CCrystalHD::GetInstance()->DevicePresent() && !hint.software )
+  if (hint.width > 720 && CCrystalHD::GetInstance()->DevicePresent())
   {
-    if (hint.width <= 720 && (hint.codec == CODEC_ID_MPEG2VIDEO))
-    {
-      if( (pCodec = OpenCodec(new CDVDVideoCodecLibMpeg2(), hint, options)) ) return pCodec;
-    }
-    else
+    if (g_guiSettings.GetBool("videoplayer.usechd") && !hint.software)
     {
       if (hint.codec == CODEC_ID_VC1 || hint.codec == CODEC_ID_H264 || hint.codec == CODEC_ID_MPEG2VIDEO)
       {