Kfir Itzhak
f33d27b9c1
Remove unnessecary SPS & PPS writing code
2013-12-30 17:02:04 +02:00
Kfir Itzhak
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
Kfir Itzhak
20bd6671be
Correctly write SPS & PPS from x264 encoder headers
2013-12-25 08:55:30 +02:00
Kfir Itzhak
1bfd38c964
Added the ability to override preset, tune, profile and few other improvements
2013-12-25 08:49:27 +02:00
Andrew Bauer
6d093c0407
Merge pull request #276 from knnniggett/foreign
...
Disables non-POSIX warning when using gnu wildcard
2013-12-23 14:49:19 -08:00
Kfir Itzhak
3c3a895ea1
Merge pull request #283 from nkwood/master
...
Remove references to zmfix in /distros
2013-12-23 13:47:55 -08:00
nkwood
f4d6d99ab2
Update zoneminder.f19.spec
2013-12-23 15:09:12 -06:00
nkwood
4a89c8d5e9
Update zoneminder.el6.spec
2013-12-23 15:08:19 -06:00
nkwood
f12dd88e5d
Update zoneminder.cmake.f19.spec
2013-12-23 15:06:38 -06:00
nkwood
8e7d89024f
Update zoneminder.cmake.el6.spec
2013-12-23 15:05:11 -06:00
nkwood
942b9c65da
Update init.d
2013-12-23 15:01:21 -06:00
nkwood
922385d761
Update init.d
2013-12-23 14:55:56 -06:00
Kfir Itzhak
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
Isaac Connor
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
Isaac Connor
01820117f0
Merge pull request #281 from martonmiklos/master
...
In the web/includes/functions.php there were some html formatting errors...
2013-12-22 11:21:23 -08:00
Miklos Marton
5de638214b
In the web/includes/functions.php there were some html formatting errors in the outputVideoStream function.
...
These errors were:
- Unclosed object and embed tags
- param tags without closing tags
These errors lead to rendering errors when using the mobile skins with some specific streaming options.
2013-12-22 15:17:21 +01:00
Kfir Itzhak
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
Kfir Itzhak
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
Edward Barnard
14024451e5
Monitor link now displays for all valid libvlc paths.
2013-12-22 01:29:40 +00:00
Ed Barnard
40b0f5d091
Merge pull request #1 from ZoneMinder/libvlc-improvements
...
Add header file checks for vlc/vlc.h
2013-12-21 17:07:57 -08:00
Edward Barnard
6c94308ba0
Fix bug in frame difference checker.
2013-12-22 01:06:12 +00:00
Andrew Bauer
b5e4e1e573
Update FI8608W_Y2k.pm
...
Fix typo
2013-12-21 11:32:47 -06:00
Kyle Johnson
2cadb3c5a6
Fixed a small typo in ConfigData.pm.in
2013-12-21 10:55:36 -05:00
Andrew Bauer
45385526d7
Update README.CentOS
...
Future versions of zmupdate will requite the Lock Tables permission. Documentation updated accordingly.
2013-12-21 09:45:40 -06:00
Andrew Bauer
db2398d1ba
Update README.Fedora
...
Future versions of zmupdate will requite the Lock Tables permission. Documentation updated accordingly.
2013-12-21 09:45:21 -06:00
Kfir Itzhak
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
Kfir Itzhak
283f71625b
Fix serve memory leak
2013-12-20 04:02:19 +02:00
Edward Barnard
aa6380c4bd
Might now build with autotools.
2013-12-19 23:15:16 +00:00
Edward Barnard
3e2647782d
Better error handling
2013-12-19 23:10:45 +00:00
Edward Barnard
f4d72752a8
Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates
2013-12-19 23:02:21 +00:00
Edward Barnard
e4a16ee57c
All colourspaces now working
2013-12-19 21:51:39 +00:00
Edward Barnard
c25011e781
Fix seemingly random lockup.
2013-12-19 21:51:39 +00:00
Edward Barnard
3201e5a431
Adds web ui support for libvlc camera.
2013-12-19 21:51:39 +00:00
Edward Barnard
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
Andy Bauer
283091a88e
Disables non-POSIX warning when using gnu wildcard
2013-12-19 14:10:22 -06:00
Isaac Connor
7251a8e1ae
fixes to $Config changes, also exit if no EVENT_PATH
2013-12-19 13:41:55 -05:00
Isaac Connor
4d9234089c
fix ZM_URL to $Config{ZM_URL}
2013-12-19 13:01:52 -05:00
Isaac Connor
462108583b
fix ZM_EVENT_PATH
2013-12-19 12:55:14 -05:00
Kfir Itzhak
e9044b436d
Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
2013-12-19 19:21:30 +02:00
Kfir Itzhak
aa1e6a4f83
Add zm_video.h to autotools
2013-12-19 19:00:04 +02:00
Kfir Itzhak
6165b91690
Add zm_video.cpp to autotools
2013-12-19 18:57:23 +02:00
Kfir Itzhak
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
Isaac Connor
0556187a0f
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-12-17 14:27:11 -05:00
Kyle Johnson
312d787617
Merge pull request #275 from ZoneMinder/274
...
Move embedded jquery. (issue #274 )
2013-12-17 10:46:23 -08:00
Kyle Johnson
cad33ddb96
Removed embedded jquery, instead include by <script>. Fixes #274
2013-12-17 13:41:55 -05:00
Kyle Johnson
1a744ebed6
Added jquery 1.4.2.min.js to the classic skin's js dir
2013-12-17 13:41:36 -05:00
Isaac Connor
7064141161
check for mysql existence first.
2013-12-17 13:13:45 -05:00
Isaac Connor
42642937e4
fix ZM_VERSION
2013-12-17 13:05:58 -05:00
Isaac Connor
53985dcab0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-12-17 12:07:51 -05:00
Isaac Connor
9e7d729ca8
use the full path for ZM_VERSION
2013-12-17 12:06:14 -05:00