ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2018-05-01 09:42:11 -04:00
parent c8eab2d275 433cffcce7
commit 11ce50925c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_videostore.cpp
View File

@ -722,7 +722,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
ipkt->pts, ipkt->pts,
video_last_pts, video_last_pts,
duration); duration);
if (duration < 0) { if (duration <= 0) {
duration = ipkt->duration ? ipkt->duration : av_rescale_q(1,video_in_stream->time_base, video_out_stream->time_base); duration = ipkt->duration ? ipkt->duration : av_rescale_q(1,video_in_stream->time_base, video_out_stream->time_base);
} }
} }

2
web/skins/classic/views/filter.php
View File

@ -29,7 +29,7 @@ $filterNames = array( ''=>translate('ChooseFilter') );
$filter = NULL; $filter = NULL;
foreach ( dbFetchAll( 'SELECT * FROM Filters ORDER BY Name' ) as $row ) { foreach ( dbFetchAll( 'SELECT * FROM Filters ORDER BY Name' ) as $row ) {
$filterNames[$row['Id']] = $row['Name']; $filterNames[$row['Id']] = $row['Id'] . ' ' . $row['Name'];
if ( $row['Background'] ) if ( $row['Background'] )
$filterNames[$row['Id']] .= '*'; $filterNames[$row['Id']] .= '*';
if ( $row['Concurrent'] ) if ( $row['Concurrent'] )