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

Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36

This commit is contained in:
Isaac Connor 2021-11-17 11:06:38 -05:00
parent b7d8add5ad a0b60aa4f7
commit 7a181fc082
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zm_stream.cpp
View File

@ -26,6 +26,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
StreamBase::~StreamBase() { StreamBase::~StreamBase() {
#if HAVE_LIBAVCODEC #if HAVE_LIBAVCODEC

14
web/skins/classic/includes/export_functions.php
View File

@ -786,7 +786,7 @@ function exportFileList(
} }
closedir($dir); closedir($dir);
} }
ZM\Debug(print_r($files, true)); ZM\Debug('All available files: '.print_r($files, true));
$exportFileList = array(); $exportFileList = array();
@ -843,6 +843,18 @@ function exportFileList(
ZM\Debug('Not including frame images'); ZM\Debug('Not including frame images');
} # end if exportImages } # end if exportImages
if ($exportVideo) {
$filesLeft = array();
foreach ($files as $file) {
if (preg_match('/\.(?:mpg|mpeg|mov|swf|mp4|mkv|avi|asf|3gp)$/', $file)) {
$exportFileList[$file] = $file;
} else {
$filesLeft[$file] = $file;
}
}
$files = $filesLeft;
}
if ($exportMisc) { if ($exportMisc) {
foreach ($files as $file) { foreach ($files as $file) {
$exportFileList[$file] = $file; $exportFileList[$file] = $file;