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

Merge ../ZoneMinder.connortechnology into storageareas

This commit is contained in:
Isaac Connor 2016-09-21 10:15:54 -04:00
parent 912d6b0f6c 01d4ca96c7
commit a3eae187f9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/zm_update-1.30.7.sql
View File

@ -4,5 +4,7 @@
-- Changing StorageId to be NOT NULL and default 0 -- Changing StorageId to be NOT NULL and default 0
-- --
UPDATE Monitors SET StorageId = 0 WHERE StorageId IS NULL;
ALTER TABLE Monitors MODIFY `StorageId` smallint(5) unsigned NOT NULL default 0; ALTER TABLE Monitors MODIFY `StorageId` smallint(5) unsigned NOT NULL default 0;
UPDATE Events SET StorageId = 0 WHERE StorageId IS NULL;
ALTER TABLE Events MODIFY `StorageId` smallint(5) unsigned NOT NULL default 0; ALTER TABLE Events MODIFY `StorageId` smallint(5) unsigned NOT NULL default 0;

2
src/zm_ffmpeg.h
View File

@ -324,7 +324,7 @@ static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, in
void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output); void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output);
#if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100) #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
#define zm_av_unref_packet( packet ) av_unref_packet( packet ) #define zm_av_unref_packet( packet ) av_packet_unref( packet )
#else #else
#define zm_av_unref_packet( packet ) av_free_packet( packet ) #define zm_av_unref_packet( packet ) av_free_packet( packet )
#endif #endif