From a5ee425996b6508f0d3d45d003d8ed87c2d2af52 Mon Sep 17 00:00:00 2001 From: max_10 Date: Sat, 7 Oct 2017 21:02:27 +0200 Subject: [PATCH] armbox: remove videodecoder hack from dmx destructor --- libarmbox/dmx.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp index 70eeed1..59b4172 100644 --- a/libarmbox/dmx.cpp +++ b/libarmbox/dmx.cpp @@ -147,18 +147,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; } bool cDemux::Open(DMX_CHANNEL_TYPE pes_type, void * /*hVideoBuffer*/, int uBufferSize)