mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

spark: remove videodecoder hack from dmx destructor

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 9f1c5a6c59
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-21 22:14:47 +01:00
committed by max_10
parent 14228d554c
commit bbbdacc945
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libspark/dmx.cpp
View File

@@ -152,18 +152,6 @@ cDemux::~cDemux()
{ {
lt_debug("%s #%d fd: %d\n", __FUNCTION__, num, fd); lt_debug("%s #%d fd: %d\n", __FUNCTION__, num, fd);
Close(); Close();
/* in zapit.cpp, videoDemux is deleted after videoDecoder
* in the video watchdog, we access videoDecoder
* the thread still runs after videoDecoder has been deleted
* => set videoDecoder to NULL here to make the check in the
* watchdog thread pick this up.
* This is ugly, but it saves me from changing neutrino
*
* if the delete order in neutrino will ever be changed, this
* will blow up badly :-(
*/
if (dmx_type == DMX_VIDEO_CHANNEL)
videoDecoder = NULL;
/* wait until Read() has released the mutex */ /* wait until Read() has released the mutex */
(*P->mutex).lock(); (*P->mutex).lock();
(*P->mutex).unlock(); (*P->mutex).unlock();