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

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

This commit is contained in:
Isaac Connor 2020-08-05 20:00:45 -04:00
parent ddeef6f031 4d4fab46d6
commit ef2ad12846
2 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/zm_mpeg.cpp
View File

@ -40,16 +40,7 @@ VideoStream::MimeData VideoStream::mime_data[] = {
}; };
void VideoStream::Initialise( ) { void VideoStream::Initialise( ) {
if ( logDebugging() ) { FFMPEGInit();
av_log_set_level( AV_LOG_DEBUG );
} else {
av_log_set_level( AV_LOG_QUIET );
}
av_register_all( );
#if LIBAVFORMAT_VERSION_CHECK(53, 13, 0, 19, 0)
avformat_network_init();
#endif
initialised = true; initialised = true;
} }

4
web/skins/classic/views/js/timeline.js.php
View File

@ -1,3 +1,7 @@
<?php
global $filterQuery;
global $monitors;
?>
var filterQuery = '<?php echo validJsStr($filterQuery) ?>'; var filterQuery = '<?php echo validJsStr($filterQuery) ?>';
<?php <?php