mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-10-25 07:48:26 -04:00
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
This commit is contained in:
1 parent
21413c0fe6
commit
bbb10fa4b4
4 files changed
+9
-9
No files matched your search
+4
-4
@@ -31,10 +31,10 @@ bool zmDbConnected = false;
|
||||
bool zmDbConnect() {
|
||||
// For some reason having these lines causes memory corruption and crashing on newer debian/ubuntu
|
||||
// But they really need to be here in order to prevent a double open of mysql
|
||||
//if ( zmDbConnected ) {
|
||||
//Warning("Calling zmDbConnect when already connected");
|
||||
//return true;
|
||||
//}
|
||||
if ( zmDbConnected ) {
|
||||
Warning("Calling zmDbConnect when already connected");
|
||||
return true;
|
||||
}
|
||||
|
||||
if ( !mysql_init(&dbconn) ) {
|
||||
Error("Can't initialise database connection: %s", mysql_error(&dbconn));
|
||||
|
||||
+3
-3
@@ -27,9 +27,9 @@ void FFMPEGInit() {
|
||||
static bool bInit = false;
|
||||
|
||||
if ( !bInit ) {
|
||||
if ( logDebugging() )
|
||||
av_log_set_level( AV_LOG_DEBUG );
|
||||
else
|
||||
//if ( logDebugging() )
|
||||
//av_log_set_level( AV_LOG_DEBUG );
|
||||
//else
|
||||
av_log_set_level( AV_LOG_QUIET );
|
||||
av_register_all();
|
||||
avformat_network_init();
|
||||
|
||||
Submodule web/api/app/Plugin/CakePHP-Enum-Behavior updated: ea90c0cd7f...ca91b87fda.
+1
-1
Submodule web/api/app/Plugin/Crud updated: 0bd63fb464...1351dde6b4.
Reference in new issue
Block a user