diff --git a/lib/libcoolstream/audio_cs.h b/lib/libcoolstream/audio_cs.h
index 049407260..b79689eab 100644
--- a/lib/libcoolstream/audio_cs.h
+++ b/lib/libcoolstream/audio_cs.h
@@ -141,12 +141,13 @@ public:
 	void getAudioInfo(int &Type, int &Layer, int &Freq, int &Bitrate, int &Mode);
 	void SetSRS(int iq_enable, int nmgr_enable, int iq_mode, int iq_level);
 	bool IsHdmiDDSupported(void);
-	void SetHdmiDD(HDMI_ENCODED_MODE type);
+	void SetHdmiDD(bool On);
 	void SetSpdifDD(bool Enable);
 	void ScheduleMute(bool On);
 	void EnableAnalogOut(bool Enable);
 	bool GetHdmiAudioCaps(cs_audio_caps_t &caps);
 	bool IsHdmiAudioFormatSupported(HDMI_AUDIO_FORMAT format);
+	void SetHdmiDD(HDMI_ENCODED_MODE type);
 };
 
 #endif //__AUDIO_CS_H_
diff --git a/lib/libcoolstream/dmx_cs.h b/lib/libcoolstream/dmx_cs.h
index 8e1304853..b74bb528e 100644
--- a/lib/libcoolstream/dmx_cs.h
+++ b/lib/libcoolstream/dmx_cs.h
@@ -5,6 +5,7 @@
 /*                                                                             */
 /* (C) 2008 CoolStream International                                           */
 /*                                                                             */
+/* $Id::                                                                     $ */
 /*******************************************************************************/
 #ifndef __DEMUX_CS_H_
 #define __DEMUX_CS_H_
@@ -14,9 +15,12 @@
 
 #define DEMUX_POLL_TIMEOUT		0  // timeout in ms
 #define MAX_FILTER_LENGTH		12    // maximum number of filters
-#ifndef DMX_FILTER_SIZE
-#define DMX_FILTER_SIZE			MAX_FILTER_LENGTH
+
+#ifdef DMX_FILTER_SIZE
+#error
 #endif
+#define DMX_FILTER_SIZE			MAX_FILTER_LENGTH
+
 #define MAX_DMX_UNITS			4
 
 typedef enum {
diff --git a/lib/libcoolstream/playback_cs.h b/lib/libcoolstream/playback_cs.h
index 6cdfa05f7..a9192bfdc 100644
--- a/lib/libcoolstream/playback_cs.h
+++ b/lib/libcoolstream/playback_cs.h
@@ -5,6 +5,7 @@
 /*                                                                             */
 /* (C) 2008 CoolStream International                                           */
 /*                                                                             */
+/* $Id::                                                                     $ */
 /*******************************************************************************/
 #ifndef __PLAYBACK_CS_H_
 #define __PLAYBACK_CS_H_
@@ -18,6 +19,14 @@ typedef enum {
 
 class cPlaybackData;
 
+typedef struct {
+	bool enabled;
+	uint16_t pid;
+	uint16_t ac3flags;
+	std::string lang;
+	std::string codec_name;
+} playback_audio_pid_info_t;
+
 class cPlayback {
 private:
 	cPlaybackData * pd;
@@ -50,6 +59,7 @@ public:
 	bool SetPosition(int position, bool absolute = false);
 	bool IsPlaying(void) const { return playing; }
 	bool IsEnabled(void) const { return enabled; }
+	void FindAllPids(playback_audio_pid_info_t *audiopids, uint16_t size, uint16_t *numpida);
 	void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
 
 };
diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp
index 8bea202f9..43297eade 100644
--- a/lib/libdvbsub/dvbsubtitle.cpp
+++ b/lib/libdvbsub/dvbsubtitle.cpp
@@ -183,8 +183,8 @@ cDvbSubtitleConverter::cDvbSubtitleConverter(void)
 		dbgconverter("cDvbSubtitleConverter: unable to get dvb subtitle codec!\n");
 		return;
 	}
-	avctx = avcodec_alloc_context();
-	if (avcodec_open(avctx, avcodec) < 0)
+	avctx = avcodec_alloc_context3(avcodec);
+	if (avcodec_open2(avctx, avcodec, NULL) < 0)
 		dbgconverter("cDvbSubtitleConverter: unable to open codec !\n");
 
 	av_log_set_level(AV_LOG_PANIC);
diff --git a/src/sectionsd/dmxapi.h b/src/sectionsd/dmxapi.h
index 25d1a0e6f..b8055a50d 100644
--- a/src/sectionsd/dmxapi.h
+++ b/src/sectionsd/dmxapi.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <stdint.h>
-#if !HAVE_TRIPLEDRAGON
+#if 0 // !HAVE_TRIPLEDRAGON
 #include <linux/dvb/dmx.h>
 #endif