diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-16 14:31:31 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-16 14:31:31 +0100 |
| commit | dec9693d8437a31dab8e4010b33b57e1476a315c (patch) | |
| tree | f4877973363fee5c1b381f83bd1fd51d1cc472ce /lib/dvb/decoder.h | |
| parent | cdb8a973f09efb2d42875d7854edba9a411719ff (diff) | |
| parent | 266b7db4f7e4a369206551e62df43e9a29edbeff (diff) | |
| download | enigma2-dec9693d8437a31dab8e4010b33b57e1476a315c.tar.gz enigma2-dec9693d8437a31dab8e4010b33b57e1476a315c.zip | |
Merge branch 'bug_124_m2ts_support'
Conflicts:
lib/dvb/pmt.cpp
lib/service/Makefile.am
Diffstat (limited to 'lib/dvb/decoder.h')
| -rw-r--r-- | lib/dvb/decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h index 3a0fbac1..7610b654 100644 --- a/lib/dvb/decoder.h +++ b/lib/dvb/decoder.h @@ -13,7 +13,7 @@ private: ePtr<eDVBDemux> m_demux; int m_fd, m_fd_demux, m_dev, m_is_freezed; public: - enum { aMPEG, aAC3, aDTS, aAAC, aAACHE, aLPCM }; + enum { aMPEG, aAC3, aDTS, aAAC, aAACHE, aLPCM, aDTSHD }; eDVBAudio(eDVBDemux *demux, int dev); enum { aMonoLeft, aStereo, aMonoRight }; void setChannel(int channel); |