SteveGilvarry
|
4245928b35
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
|
2014-10-12 20:10:36 +11:00 |
Andrew Bauer
|
9163536219
|
Merge pull request #358 from knnniggett/prevbutton
Fix prev button while in gapless mode. All buttons tested and working.
|
2014-07-04 10:33:05 -05:00 |
stevegilvarry
|
33090f2264
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
configure.ac
src/zm_config_defines.h
src/zm_ffmpeg.h
web/index.php
|
2014-05-30 01:55:24 +10:00 |
Isaac Connor
|
00aad4a128
|
frame_count should be an integer so don't use NULL
|
2014-05-05 13:06:58 -04:00 |
|
Isaac Connor
|
a8929914bb
|
add a NULL test for frame_coutn before calling atoi.
|
2014-05-05 11:29:09 -04:00 |
|
Andrew Bauer
|
b126ca3e01
|
modify play button
|
2014-03-30 11:18:14 -05:00 |
|
Andrew Bauer
|
3f7f398210
|
rework prev and next buttons
|
2014-03-28 17:18:34 -05:00 |
|
Andrew Bauer
|
264b98548f
|
Fix prev button while in gapless mode. All buttons tested and working.
|
2014-03-25 17:12:26 -05:00 |
|
Andrew Bauer
|
d2be7d4cd8
|
Update zm_event.cpp
Commit 79af2adaa0 attempted to fix the Prev button when in Gapless Mode, but it caused issues when rewinding. Rolling back.
|
2014-03-25 07:01:40 -05:00 |
David Nesting
|
79c7a1b255
|
Apply INSERTs in Event::AddFrames in batches to avoid excessive query length
|
2013-10-26 18:41:12 -07:00 |
|
Andrew Bauer
|
79af2adaa0
|
When loading a new event, always set the current frame id to the first frame rather than the last
|
2013-10-09 07:32:27 -05:00 |
mastertheknife
|
a9e886aea2
|
Fix small zipped images bug introduced by commit e12a9dc408
|
2013-10-06 06:35:56 +03:00 |
|
mastertheknife
|
e12a9dc408
|
Fixed compilation failure when zlib is not available
|
2013-10-04 23:20:39 +03:00 |
Chris Wiggins
|
9c168a9af5
|
Check if videoing for bulk frame adding too
|
2013-09-29 10:10:16 +13:00 |
|
Chris Wiggins
|
35468a5b9c
|
Tidy up starting and stopping of recording
|
2013-09-28 23:22:58 +12:00 |
|
Chris Wiggins
|
938f81c753
|
Add snapshot.jpg to event directory if we are doing a video recording
|
2013-09-28 23:17:22 +12:00 |
|
Chris Wiggins
|
65afc830b1
|
Save a snapshot image alongside the h264 video for thumbnail and poster use
|
2013-09-28 18:50:54 +12:00 |
|
Chris Wiggins
|
774a84d487
|
Updated event processing to actually add frames into the DB. Use MP4 container
|
2013-09-14 00:50:54 +12:00 |
nextime
|
33cbd89212
|
Migrate svn to git
|
2013-03-17 00:45:21 +01:00 |