ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

pull/2069/head
Isaac Connor 2018-03-14 10:44:57 -04:00
parent a73a7b438c 280dd8b04c
commit d82d2e7765
2 changed files with 2 additions and 4 deletions
scripts
ZoneMinder/lib/ZoneMinder
zmvideo.pl.in

4
scripts/ZoneMinder/lib/ZoneMinder/Event.pm
View File

@ -195,8 +195,8 @@ sub GenerateVideo {
$frame_rate = $fps; $frame_rate = $fps;
} }
my $width = $self->{MonitorWidth}; my $width = $self->{Width};
my $height = $self->{MonitorHeight}; my $height = $self->{Height};
my $video_size = " ${width}x${height}"; my $video_size = " ${width}x${height}";
if ( $scale ) { if ( $scale ) {

2
scripts/zmvideo.pl.in
View File

@ -197,8 +197,6 @@ my $sql = " SELECT (SELECT max(Delta) FROM Frames WHERE EventId=Events.Id)-(SELE
Events.*, Events.*,
unix_timestamp(Events.StartTime) as Time, unix_timestamp(Events.StartTime) as Time,
M.Name as MonitorName, M.Name as MonitorName,
M.Width as MonitorWidth,
M.Height as MonitorHeight,
M.Palette M.Palette
FROM Events FROM Events
INNER JOIN Monitors as M on Events.MonitorId = M.Id INNER JOIN Monitors as M on Events.MonitorId = M.Id