diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 00:13:59 (GMT) |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 00:13:59 (GMT) |
| commit | 979cdde152f5998de6593f1d3b6998bb224d5c97 (patch) | |
| tree | ab3201fb90a848993b0ab76728710b8c09d0289e /lib/dvb/decoder.cpp | |
| parent | 544e1af49c6c1c25a3ef97b27ac3e6764a008824 (diff) | |
fix merge
Diffstat (limited to 'lib/dvb/decoder.cpp')
| -rw-r--r-- | lib/dvb/decoder.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index f73dbdd..6f0ead6 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -295,7 +295,6 @@ eDVBAudio::~eDVBAudio() DEFINE_REF(eDVBVideo); eDVBVideo::eDVBVideo(eDVBDemux *demux, int dev) -<<<<<<< HEAD:lib/dvb/decoder.cpp : m_demux(demux), m_dev(dev), m_width(-1), m_height(-1), m_framerate(-1), m_aspect(-1), m_progressive(-1) { |