Revert "[mvc] Enable 3d attribute of mvc video automatically"

This reverts commit 1b1eaa6.
popcornmix · May 28, 2015 · d9d3baf · d9d3baf
1 parent 3ea17a7
commit d9d3baf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp
@@ -537,7 +537,7 @@ bool CMMALVideo::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options)
       // H.264
       m_codingType = MMAL_ENCODING_H264;
       m_pFormatName = "mmal-h264";
-      if (CSettings::Get().GetBool("videoplayer.supportmvc") && hints.codec_tag == AV_CODEC_ID_H264MVC)
+      if (CSettings::Get().GetBool("videoplayer.supportmvc"))
       {
         m_codingType = MMAL_ENCODING_MVC;
         m_pFormatName= "mmal-mvc";

diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -1278,8 +1278,6 @@ CDemuxStream* CDVDDemuxFFmpeg::AddStream(int iId)
           // check for metadata in file if detection in stream failed
         if (stereoMode.empty())
           stereoMode = GetStereoModeFromMetadata(m_pFormatContext->metadata);
-        if (stereoMode.empty() && pStream->codec->codec_tag == AV_CODEC_ID_H264MVC)
-          stereoMode = "top_bottom";
         if (!stereoMode.empty())
           st->stereo_mode = stereoMode;
 

diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp
@@ -421,7 +421,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, EDEINTERLACEMODE de
           break;
       }
     }
-    if (CSettings::Get().GetBool("videoplayer.supportmvc") && hints.codec_tag == AV_CODEC_ID_H264MVC)
+    if (CSettings::Get().GetBool("videoplayer.supportmvc"))
     {
       m_codingType = OMX_VIDEO_CodingMVC;
       m_video_codec_name = "omx-mvc";