From a6fb12c83bb712faa270b3cba7ff3d2b17b0209e Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Fri, 5 Nov 2010 22:02:29 +0100
Subject: Small fixups, removed P1,P2 of RTL logo

---
 command/markad-standalone.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'command/markad-standalone.cpp')

diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
index a9bfdb1..b74e6e3 100644
--- a/command/markad-standalone.cpp
+++ b/command/markad-standalone.cpp
@@ -269,6 +269,7 @@ void cMarkAdStandalone::CheckStartStop(int frame, bool checkend)
             {
                 // check if we have an MT_ASPECTCHANGE in low distance
                 clMark *aspectmark=marks.GetPrev(newpos,MT_ASPECTSTART);
+                if (!aspectmark) aspectmark=marks.GetNext(newpos,MT_ASPECTSTART);
                 if (aspectmark)
                 {
                     int MAXMARKDIFF=(int) (macontext.Video.Info.FramesPerSecond*20);
@@ -517,6 +518,7 @@ void cMarkAdStandalone::CheckAspectRatio_and_AudioChannels()
         {
             isyslog("DolbyDigital5.1 audio detected. logo/border detection disabled");
             bDecodeVideo=false;
+            setAudio20=false;
             setAudio51=true;
             reprocess=true;
         }
@@ -729,7 +731,7 @@ void cMarkAdStandalone::AddMark(MarkAdMark *Mark)
             deleteLogoBorder=true;
         }
 
-        if ((Mark->Type==MT_ASPECTSTART) && (Mark->Position>chkLEFT) &&
+        if (((Mark->Type & 0xF0)==MT_ASPECTCHANGE) && (Mark->Position>chkLEFT) &&
                 (Mark->Position<chkRIGHT) && (!macontext.Video.Options.IgnoreLogoDetection))
         {
             if (!loggedAlready)
-- 
cgit v1.2.3