summaryrefslogtreecommitdiff
path: root/video.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'video.cpp')
-rw-r--r--video.cpp28
1 files changed, 15 insertions, 13 deletions
diff --git a/video.cpp b/video.cpp
index 122c346..ca6d3fa 100644
--- a/video.cpp
+++ b/video.cpp
@@ -606,22 +606,24 @@ MarkAdMark *cMarkAdVideo::Process(int LastIFrame)
}
}
- if (AspectRatioChange(&macontext->Video.Info.AspectRatio,&aspectratio))
+ if (!macontext->Video.Options.IgnoreAspectRatio)
{
- char *buf=NULL;
- if (asprintf(&buf,"aspect ratio change from %i:%i to %i:%i (%i)",
- aspectratio.Num,aspectratio.Den,
- macontext->Video.Info.AspectRatio.Num,
- macontext->Video.Info.AspectRatio.Den,LastIFrame)!=-1)
+ if (AspectRatioChange(&macontext->Video.Info.AspectRatio,&aspectratio))
{
- isyslog("markad [%i]: %s",recvnumber, buf);
- AddMark(LastIFrame,buf);
- free(buf);
+ char *buf=NULL;
+ if (asprintf(&buf,"aspect ratio change from %i:%i to %i:%i (%i)",
+ aspectratio.Num,aspectratio.Den,
+ macontext->Video.Info.AspectRatio.Num,
+ macontext->Video.Info.AspectRatio.Den,LastIFrame)!=-1)
+ {
+ isyslog("markad [%i]: %s",recvnumber, buf);
+ AddMark(LastIFrame,buf);
+ free(buf);
+ }
}
- }
-
- aspectratio.Num=macontext->Video.Info.AspectRatio.Num;
- aspectratio.Den=macontext->Video.Info.AspectRatio.Den;
+ aspectratio.Num=macontext->Video.Info.AspectRatio.Num;
+ aspectratio.Den=macontext->Video.Info.AspectRatio.Den;
+ }
return &mark;
}