From bbbdacc945ee325923bcf935b01b927fb06160ae Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 21 Feb 2015 22:14:47 +0100 Subject: [PATCH] spark: remove videodecoder hack from dmx destructor Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9f1c5a6c59ba7e69f24944ef1d7369d0c2854999 Author: Stefan Seyfried Date: 2015-02-21 (Sat, 21 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/dmx.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp index 6f8a969..caa4fc9 100644 --- a/libspark/dmx.cpp +++ b/libspark/dmx.cpp @@ -152,18 +152,6 @@ cDemux::~cDemux() { lt_debug("%s #%d fd: %d\n", __FUNCTION__, num, fd); 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 */ (*P->mutex).lock(); (*P->mutex).unlock();