Merge pull request xbmc#8163 from stefansaraev/8137-isengard

dvdplayer: fix non DVB subs after 5c0d694
afedchin · Oct 3, 2015 · ab1154e · ab1154e
2 parents 6bbcb62 + 4cf56e8
commit ab1154e
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp
@@ -243,14 +243,17 @@ CDVDOverlay* CDVDOverlayCodecFFmpeg::GetOverlay()
     m_height = m_pCodecContext->height;
     m_width  = m_pCodecContext->width;
 
-    // ETSI EN 300 743 V1.3.1
-    // 5.3.1
-    // Absence of a DDS in a stream implies that the stream is coded in accordance with EN 300 743 (V1.2.1) [5] and that a
-    // display width of 720 pixels and a display height of 576 lines may be assumed.
-    if (!m_height && !m_width)
+    if (m_pCodecContext->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
     {
-      m_width = 720;
-      m_height = 576;
+      // ETSI EN 300 743 V1.3.1
+      // 5.3.1
+      // Absence of a DDS in a stream implies that the stream is coded in accordance with EN 300 743 (V1.2.1) [5] and that a
+      // display width of 720 pixels and a display height of 576 lines may be assumed.
+      if (!m_height && !m_width)
+      {
+        m_width = 720;
+        m_height = 576;
+      }
     }
 
     RENDER_STEREO_MODE render_stereo_mode = g_graphicsContext.GetStereoMode();