summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscop <scop>2005-03-14 12:32:58 +0000
committerscop <scop>2005-03-14 12:32:58 +0000
commitd7dcdbb93623a3cc289a84c42f27b4bfc5c19e89 (patch)
tree51e7667528b3cc6f65720abf884ebdd1bf9aaa11
parentf281720174ef3a9e5bef341b0a570d69992c2b48 (diff)
downloadvdr-plugin-dxr3-d7dcdbb93623a3cc289a84c42f27b4bfc5c19e89.tar.gz
vdr-plugin-dxr3-d7dcdbb93623a3cc289a84c42f27b4bfc5c19e89.tar.bz2
Fix audio and video thread deletion in demux device destructor.
-rw-r--r--HISTORY1
-rw-r--r--dxr3demuxdevice.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 64c0917..3b6d67a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -242,3 +242,4 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
- removed -lz from makefile
- use $CXX for generating dependencies instead of hardcoded g++
- added descriptions to audio and video output threads
+- fixed audio and video thread deletion in demux device destructor
diff --git a/dxr3demuxdevice.c b/dxr3demuxdevice.c
index 0048b6e..8fc50d2 100644
--- a/dxr3demuxdevice.c
+++ b/dxr3demuxdevice.c
@@ -72,14 +72,14 @@ m_vBuf(VIDEO_MAX_BUFFER_SIZE, VIDEO_MAX_FRAME_SIZE, m_dxr3Device)
// deconstr.
cDxr3DemuxDevice::~cDxr3DemuxDevice()
{
- if (!m_pVideoThread)
+ if (m_pVideoThread)
{
delete m_pVideoThread;
}
- if (!m_pVideoThread)
+ if (m_pAudioThread)
{
- delete m_pVideoThread;
+ delete m_pAudioThread;
}
}