diff options
| author | austriancoder <austriancoder> | 2004-10-10 20:42:36 +0000 |
|---|---|---|
| committer | austriancoder <austriancoder> | 2004-10-10 20:42:36 +0000 |
| commit | 4081c20fd83ff5d41c9eea45306894752a5d63f2 (patch) | |
| tree | d8a00fead8f7547a8484f9473326c0b4db062e4b /dxr3interface_spu_encoder.c | |
| parent | ea3e8d835857c20c740df03a9cb609f961944ae8 (diff) | |
| download | vdr-plugin-dxr3-4081c20fd83ff5d41c9eea45306894752a5d63f2.tar.gz vdr-plugin-dxr3-4081c20fd83ff5d41c9eea45306894752a5d63f2.tar.bz2 | |
using now std:: instead of namespace std;
Diffstat (limited to 'dxr3interface_spu_encoder.c')
| -rw-r--r-- | dxr3interface_spu_encoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dxr3interface_spu_encoder.c b/dxr3interface_spu_encoder.c index e47a2c1..b9e59b9 100644 --- a/dxr3interface_spu_encoder.c +++ b/dxr3interface_spu_encoder.c @@ -227,10 +227,10 @@ void cSPUEncoder::CalculateActiveOsdArea() // calculate for (int i = 0; i < 8; i++) { - m_active_osd.x0 = max(m_active_osd.x0, m_windows[i].x0); - m_active_osd.x1 = max(m_active_osd.x1, m_windows[i].y0); - m_active_osd.y0 = max(m_active_osd.y0, m_windows[i].x1); - m_active_osd.y1 = max(m_active_osd.y1, m_windows[i].y1); + m_active_osd.x0 = std::max(m_active_osd.x0, m_windows[i].x0); + m_active_osd.x1 = std::max(m_active_osd.x1, m_windows[i].y0); + m_active_osd.y0 = std::max(m_active_osd.y0, m_windows[i].x1); + m_active_osd.y1 = std::max(m_active_osd.y1, m_windows[i].y1); } cLog::Instance() << "OSD x0: " << m_active_osd.x0 << "\n"; |