summaryrefslogtreecommitdiff
path: root/command/video.cpp
diff options
context:
space:
mode:
authorJochen Dolze <vdr@dolze.de>2011-02-14 11:50:09 +0100
committerJochen Dolze <vdr@dolze.de>2011-02-14 11:50:09 +0100
commit92599dbf7638540b9ed9ff3dbd6f2625c1c3f45f (patch)
tree851db7a7ea6c7177e6402bbfe1b8950a062b6f3b /command/video.cpp
parentb48a0e3f7bee7f9fc4825e0bce4c06ed90d3794c (diff)
downloadvdr-plugin-markad-92599dbf7638540b9ed9ff3dbd6f2625c1c3f45f.tar.gz
vdr-plugin-markad-92599dbf7638540b9ed9ff3dbd6f2625c1c3f45f.tar.bz2
Improved stop detection
H262 fps detection bugfix
Diffstat (limited to 'command/video.cpp')
-rw-r--r--command/video.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/command/video.cpp b/command/video.cpp
index 7d09dd2..d0de34a 100644
--- a/command/video.cpp
+++ b/command/video.cpp
@@ -406,7 +406,11 @@ int cMarkAdLogo::Detect(int framenumber, int *logoframenumber)
int cMarkAdLogo::Process(int FrameNumber, int *LogoFrameNumber)
{
if (!macontext) return LOGO_ERROR;
- if (!macontext->Video.Data.Valid) return LOGO_ERROR;
+ if (!macontext->Video.Data.Valid)
+ {
+ area.status=LOGO_UNINITIALIZED;
+ return LOGO_ERROR;
+ }
if (!macontext->Video.Info.Width) return LOGO_ERROR;
if (!macontext->Video.Info.Height) return LOGO_ERROR;
if (!macontext->Config->logoDirectory[0]) return LOGO_ERROR;
@@ -862,6 +866,10 @@ MarkAdMarks *cMarkAdVideo::Process(int FrameNumber, int FrameNumberNext)
}
}
}
+ else
+ {
+ logo->SetStatusUninitialized();
+ }
int hborderframenumber;
int hret=hborder->Process(FrameNumber,&hborderframenumber);