git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix merge
[enigma2.git]
/
lib
/
dvb
/
decoder.cpp
diff --git
a/lib/dvb/decoder.cpp
b/lib/dvb/decoder.cpp
index f73dbdd99b8878e24a83f090b1a6873628dfb830..6f0ead653c720cddd63b7d29b0d67ccfc9b33a0d 100644
(file)
--- 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)
{