From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 20 Dec 2010 12:21:27 +0000 (+0100)
Subject: Merge branch 'obi/master' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=41a34ba7cc10000dbc950203aed2285879b5b11d;hp=-c

Merge branch 'obi/master' into experimental
---

41a34ba7cc10000dbc950203aed2285879b5b11d
diff --combined lib/dvb/pmt.h
index aa5d34d,86b634f..c963c76
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@@ -144,7 -144,7 +144,7 @@@ public
  	{
  		int pid,
  		    rdsPid; // hack for some radio services which transmit radiotext on different pid (i.e. harmony fm, HIT RADIO FFH, ...)
 -		enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM };
 +		enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM, atDTSHD };
  		int type; // mpeg2, ac3, dts, ...
  		
  		int component_tag;
@@@ -185,7 -185,7 +185,7 @@@
  		{
  			uint16_t caid;
  			int capid;
- 			bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+ 			bool operator< (const struct capid_pair &t) const { return t.caid < caid; }
  		};
  		std::vector<videoStream> videoStreams;
  		std::vector<audioStream> audioStreams;