diff options
| author | fritsch <peter.fruehberger@gmail.com> | 2014-01-11 14:15:48 +0100 |
|---|---|---|
| committer | fritsch <Peter.Fruehberger@gmail.com> | 2014-02-09 21:14:55 +0100 |
| commit | e3f9c7b617475961c8c04eab2d1f29967a1cfca9 (patch) | |
| tree | b9c2659a711b13e4c7e3df6a6543e4c780164495 | |
| parent | 47d183214fc7f88a2565d25219131be1fd200b62 (diff) | |
VDPAU: Remove AdvancedSettings for mpeg4
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 3 | ||||
| -rw-r--r-- | xbmc/settings/AdvancedSettings.cpp | 2 | ||||
| -rw-r--r-- | xbmc/settings/AdvancedSettings.h | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp index 277802fc1a..e5d58f4244 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -504,9 +504,6 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat, unsigned int m_vdpauConfig.numRenderBuffers = surfaces; m_decoderThread = CThread::GetCurrentThreadId(); - if ((avctx->codec_id == AV_CODEC_ID_MPEG4) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) - return false; - if (!CVDPAUContext::EnsureContext(&m_vdpauConfig.context)) return false; diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 462371e599..e88733e59e 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -161,7 +161,6 @@ void CAdvancedSettings::Initialize() m_videoNonLinStretchRatio = 0.5f; m_videoEnableHighQualityHwScalers = false; m_videoAutoScaleMaxFps = 30.0f; - m_videoAllowMpeg4VDPAU = false; m_videoAllowMpeg4VAAPI = false; m_videoDisableBackgroundDeinterlace = false; m_videoCaptureUseOcclusionQuery = -1; //-1 is auto detect @@ -597,7 +596,6 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f); XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); - XMLUtils::GetBoolean(pElement,"allowmpeg4vdpau",m_videoAllowMpeg4VDPAU); XMLUtils::GetBoolean(pElement,"disablehi10pmultithreading",m_videoDisableHi10pMultithreading); XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h index 88d2cde6ed..32374473f8 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -181,7 +181,6 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler float m_videoNonLinStretchRatio; bool m_videoEnableHighQualityHwScalers; float m_videoAutoScaleMaxFps; - bool m_videoAllowMpeg4VDPAU; bool m_videoAllowMpeg4VAAPI; std::vector<RefreshOverride> m_videoAdjustRefreshOverrides; std::vector<RefreshVideoLatency> m_videoRefreshLatency; |