From 979cdde152f5998de6593f1d3b6998bb224d5c97 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Fri, 13 Feb 2009 01:13:59 +0100 Subject: [PATCH] fix merge --- lib/dvb/decoder.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index f73dbdd9..6f0ead65 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) { -- 2.30.2