Isaac Connor
|
bd22d72e18
|
cleanups, code style, free resample_context
|
2016-09-26 11:01:47 -04:00 |
|
Isaac Connor
|
8f6007bb49
|
fixes
|
2016-09-25 11:26:48 -04:00 |
|
Isaac Connor
|
aaab089b72
|
make storagea->Path absolute by appending PATH_WEB
|
2016-09-25 09:31:20 -04:00 |
|
Isaac Connor
|
8e6136c821
|
reset start pts and dts when values are out of sync
|
2016-09-23 18:06:40 -04:00 |
|
Isaac Connor
|
0d418882e7
|
sorta works
|
2016-09-23 15:39:52 -04:00 |
|
Isaac Connor
|
b8c7b6ae77
|
Merge branch 'storageareas' into record_audio
|
2016-09-23 11:34:15 -04:00 |
|
Isaac Connor
|
782f9395ae
|
turn down the debugging
|
2016-09-23 09:51:03 -04:00 |
|
Isaac Connor
|
a5b7b6e74f
|
move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video
|
2016-09-22 10:43:20 -04:00 |
|
Isaac Connor
|
3dcc1c3697
|
fix php outputting extra newlines after content
|
2016-09-22 10:37:32 -04:00 |
|
Isaac Connor
|
95bbaf42b6
|
change the version test to include ffmpeg 56.60.100 for av_packet_unref
|
2016-09-21 16:03:24 -04:00 |
|
Isaac Connor
|
984394f920
|
packet needs to be both unref'd and freed when we use av_malloc to allocate a packet
|
2016-09-21 16:02:51 -04:00 |
|
Isaac Connor
|
32d145cf2e
|
free writejpg_ccinfo structs as well
|
2016-09-21 16:02:14 -04:00 |
|
Isaac Connor
|
d96febd967
|
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
|
2016-09-21 16:00:23 -04:00 |
|
Isaac Connor
|
4b5af390fd
|
merge
|
2016-09-21 12:44:27 -04:00 |
|
Isaac Connor
|
249d3cadc5
|
fix for video on stream 1
|
2016-09-21 12:17:09 -04:00 |
|
Isaac Connor
|
1310aee1cc
|
handle video stream at index 1 without audio
|
2016-09-21 12:12:40 -04:00 |
|
Isaac Connor
|
6292ce3748
|
undo stupid thing
|
2016-09-21 12:07:58 -04:00 |
|
Isaac Connor
|
2f248cd4b1
|
log time bases on videostore instantiation instead of every packet
|
2016-09-21 11:58:59 -04:00 |
|
Isaac Connor
|
f5405a4131
|
clearer debug output
|
2016-09-21 11:57:42 -04:00 |
|
Isaac Connor
|
ae63861cd1
|
better codec_tag setting
|
2016-09-21 11:57:30 -04:00 |
|
Isaac Connor
|
8b13401250
|
more debugging
|
2016-09-21 11:37:59 -04:00 |
|
Isaac Connor
|
a8c4fdd616
|
more debug
|
2016-09-21 10:58:02 -04:00 |
|
Isaac Connor
|
e1a29f47b9
|
more debug
|
2016-09-21 10:57:21 -04:00 |
|
Isaac Connor
|
4359c65601
|
better debugging of timebase
|
2016-09-21 10:56:09 -04:00 |
|
Isaac Connor
|
091459004c
|
ServerId can be 0
|
2016-09-21 10:30:31 -04:00 |
|
Isaac Connor
|
e0b0b42966
|
fixup dts calcs
|
2016-09-21 10:29:49 -04:00 |
|
Isaac Connor
|
a3eae187f9
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-21 10:15:54 -04:00 |
|
Isaac Connor
|
01d4ca96c7
|
av_unref_packet should be av_packet_unref
|
2016-09-21 10:15:23 -04:00 |
|
Isaac Connor
|
288b03290c
|
remark out some debugging
|
2016-09-21 09:05:55 -04:00 |
|
Isaac Connor
|
f0a9820096
|
need to convert NULL values before saying not null
|
2016-09-20 17:53:35 -04:00 |
|
Isaac Connor
|
912d6b0f6c
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-20 17:03:23 -04:00 |
|
Isaac Connor
|
19a60b01da
|
maybe fixes, maybe big memleaks
|
2016-09-20 16:59:43 -04:00 |
|
Isaac Connor
|
364a80fb94
|
don't output jpeg header unless there is some kind of success
|
2016-09-20 15:55:28 -04:00 |
|
Isaac Connor
|
f40c8d0da8
|
contains due to glob
|
2016-09-20 15:54:37 -04:00 |
|
Isaac Connor
|
bc0b499697
|
update zm_create.sql.in to match the update scripts
|
2016-09-20 14:10:37 -04:00 |
|
Isaac Connor
|
4750c016c4
|
define a zm version of av_frame_alloc to clean up code
|
2016-09-20 14:05:28 -04:00 |
|
Isaac Connor
|
97053df0b1
|
define a zm version of av_frame_alloc to clean up code
|
2016-09-20 14:05:25 -04:00 |
|
Isaac Connor
|
d26f3c9a6c
|
define a zm version of av_frame_alloc to clean up code
|
2016-09-20 14:05:16 -04:00 |
|
Isaac Connor
|
a03d2a393f
|
add ffmpeg as an option to libav-tools
|
2016-09-20 13:22:49 -04:00 |
|
Isaac Connor
|
bf45f489f7
|
Merge branch 'storageareas' into record_audio
|
2016-09-20 12:38:47 -04:00 |
|
Isaac Connor
|
33ab9d3098
|
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
|
2016-09-20 12:19:44 -04:00 |
|
Isaac Connor
|
5ce2e95fb7
|
replace getDiskPercent call with code to show percent for all storageareas
|
2016-09-20 12:18:50 -04:00 |
|
Isaac Connor
|
fb610ba87d
|
fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
|
2016-09-20 12:18:20 -04:00 |
|
Isaac Connor
|
1add270b72
|
fixup saving Filters and executing them
|
2016-09-20 12:17:19 -04:00 |
|
Isaac Connor
|
f06723a178
|
add disk_usage_percent and fix whitespace
|
2016-09-20 12:16:49 -04:00 |
|
Isaac Connor
|
5604fe5610
|
add more debugging and fix LinkPath -> LinkPath
|
2016-09-20 12:16:07 -04:00 |
|
Isaac Connor
|
a3e99cf08d
|
quick update to Monitor to use Object methods
|
2016-09-20 12:15:48 -04:00 |
|
Isaac Connor
|
0614af4f51
|
work on audio encoding
|
2016-09-20 10:10:02 -04:00 |
|
Isaac Connor
|
ae80fd4d2d
|
put startTime init back where it belongs
|
2016-09-19 21:33:20 -04:00 |
|
Isaac Connor
|
d63c1810be
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-19 21:09:55 -04:00 |