Remove videoplayer.useframemtdec setting and make it default

4 files changed, 4 insertions, 21 deletions

diff --git a/language/English/strings.po b/language/English/strings.po
index 197c0c701e..e52825c1a8 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -6105,10 +6105,7 @@ msgctxt "#13439"
 msgid "Allow hardware acceleration (MediaCodec)"
 msgstr ""
 
-#: system/settings/settings.xml
-msgctxt "#13440"
-msgid "Allow multi threaded software decoding"
-msgstr ""
+# empty string with id 13440
 
 #: system/settings/settings.xml
 msgctxt "#13441"
@@ -15356,11 +15353,7 @@ msgctxt "#36422"
 msgid "Enable hardware video decode using AMLogic decoder."
 msgstr ""
 
-#. Description of setting "Videos -> Playback -> Allow frame-multi-threaded decoding" with label #13440
-#: system/settings/settings.xml
-msgctxt "#36423"
-msgid "Enables frame-multi-threaded software decoding (less reliable than the default single threaded mode)."
-msgstr ""
+#empty string with id 36423
 
 #: system/settings/settings.xml
 msgctxt "#36424"
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 28e68eba63..21f06ede1b 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -12,11 +12,6 @@
       <group id="1">
         <visible>false</visible>
       </group>
-      <group id="3">
-        <setting id="videoplayer.useframemtdec">
-          <visible>false</visible>
-        </setting>
-      </group>
     </category>
   </section>
 
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index b855fc6ae7..57fddfd3d6 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -588,11 +588,6 @@
           </constraints>
           <control type="spinner" format="integer" />
         </setting>
-        <setting id="videoplayer.useframemtdec" type="boolean" parent="videoplayer.decodingmethod" label="13440" help="36423">
-          <level>2</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
         <setting id="videoplayer.useamcodec" type="boolean" label="13438" help="36422">
           <requirement>HAVE_AMCODEC</requirement>
           <dependencies>
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
index 718d781d23..0c4f0e5fe5 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -244,9 +244,9 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
    * sensitive to changes in frame sizes, and it causes crashes
    * during HW accell - so we unset it in this case.
    * */
-  if (((EDECODEMETHOD) CSettings::Get().GetInt("videoplayer.decodingmethod") == VS_DECODEMETHOD_SOFTWARE || m_isSWCodec) && CSettings::Get().GetBool("videoplayer.useframemtdec"))
+  if ((EDECODEMETHOD) CSettings::Get().GetInt("videoplayer.decodingmethod") == VS_DECODEMETHOD_SOFTWARE || m_isSWCodec)
   {
-    CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Keep default threading %d by videoplayer.useframemtdec",
+    CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Keeping default threading %d",
                         m_pCodecContext->thread_type);
   }
   else