Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6

diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
index 90bf19e1d68aa72d93f17ec8077a03482b2f3b30..710cc421ec59a6a476249c8bd6917df35639e7fc 100644 (file)
--- a/lib/dvb/decoder.cpp
+++ b/lib/dvb/decoder.cpp
@@ -222,9 +222,6 @@ int eDVBAudio::startPid(int pid, int type)
 
 void eDVBAudio::stop()
 {
-#if HAVE_DVB_API_VERSION > 2
-       flush();
-#endif
        eDebugNoNewLine("AUDIO_STOP - ");
        if (::ioctl(m_fd, AUDIO_STOP) < 0)
                eDebug("failed (%m)");