Kfir Itzhak
96902c216d
Fix comparison sign warning introduced in pull request #174 commit 33b6e5c
2013-10-05 16:42:13 +03:00
mastertheknife
e12a9dc408
Fixed compilation failure when zlib is not available
2013-10-04 23:20:39 +03:00
Isaac Connor
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
Kyle Johnson
02e1a5eea6
Merge pull request #174 from POKKAHOH/rtsp-updates
...
More RTSP support, decoding fragmented NAL, understand sprop-parametr-sets
* Can now view more RTSP streams (including newer Axis cameras)
* Decode fragmented NAL
* Understand sprop-parametr-sets
* Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
* Remove #else errors for avutils/ffmpeg
2013-10-03 05:08:07 -07:00
POKKAHOH
b0a014928e
remove #else errors for avutils/ffmpeg
2013-10-01 16:05:49 +04:00
mastertheknife
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
POKKAHOH
25ff325118
Comment missed in determining stream header.
...
Property 'title' and 'comment' not supported.
2013-09-27 16:51:33 +04:00
POKKAHOH
33b6e5cd03
Now can recive RTSP stream.
...
Decode fragmented NAL
Understand sprop-parametr-sets
Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
2013-09-27 15:08:11 +04:00
mastertheknife
dddec742e0
Fixed zm_logger not including zm_config.h first.
2013-09-25 09:00:52 +03:00
mastertheknife
e8d20faec8
Proper checking for sys/syscall.h
2013-09-25 07:11:59 +03:00
Raul Almeida
f2225f23cd
Update zm_thread.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:07:36 -03:00
Raul Almeida
aeed1d4043
Update zm_timer.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:03:36 -03:00
mastertheknife
aef9ab2f00
Removed NumCoords entirely from zm_zone.cpp
2013-09-24 07:41:37 +03:00
mastertheknife
ac7f7f08a7
Fix some compilation warnings
2013-09-24 07:31:02 +03:00
mastertheknife
c526fcedd7
Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
2013-09-24 07:15:37 +03:00
Isaac Connor
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
mastertheknife
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
mastertheknife
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
Isaac Connor
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
mastertheknife
2b568906e5
Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs
2013-09-10 18:37:56 +03:00
Isaac Connor
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
Kyle Johnson
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
Andy
3764000f81
Fix "Can't stat : No such file or directory" message
...
Many zoneminder systems have a "Can't stat : No such file or directory" in their logs each time zmfix is run. The problem was traced back to the sql query, which looked for a ControlDevice field that was not null. However, the ControlDevice field is empty, rather than null, when there is no control device.
2013-08-30 14:30:47 -05:00
Andy
4e9698ae13
Fix for Issue #88 - ZMS crashing
...
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 07:22:41 -05:00
Kyle Johnson
35c36bd769
Merge pull request #80 from knnniggett/corruptjpeg
...
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-20 06:24:20 -07:00
Kyle Johnson
de9b1af1a1
Merge pull request #79 from knnniggett/frameserver
...
Added frameserver patch from Zoneminder Wiki
Changes the socket reader in zmf from a single read, to a loop read.
Incomplete reads would be reported even though the image writer wrote
the whole image to the socket. The problem was when the read went to
read the image frame from the socket, all the data had not yet been written
to the socket by the writer, so the reader thought there was a problem.
The loop reads from the socket until a full image frame is read, or there is
an error.
Originally at http://www.zoneminder.com/wiki/index.php/1.24.2_Patches
2013-08-20 06:23:34 -07:00
Knniggett
860c331d58
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-18 15:01:46 -05:00
Andrew Bauer
31daa32194
Added frameserver patch from Zoneminder Wiki
2013-08-18 13:28:55 -05:00
Kyle Johnson
0a911d9d27
The .deps directory shouldn't have been included. Removing it.
...
.deps is generated during configure (or is it make?). Fixes #52
2013-08-15 12:44:10 -04:00
Kyle Johnson
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
Kyle Johnson
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
Kyle Johnson
c3f468eb8c
Fixing zm_image_analyser.h:13:25: fatal error: zm_detector.h: No such file or directory
2013-08-13 09:53:31 -04:00
Kyle Johnson
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
Isaac Connor
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
Isaac Connor
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
Isaac Connor
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
Isaac Connor
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
Isaac Connor
044af38cdb
match up #if's regarding gnutls-openssl
2013-04-29 16:44:37 -04:00
Isaac Connor
ce61512a0d
gnutls changes from ubuntu package
2013-04-29 15:32:55 -04:00
Isaac Connor
36f25c7ffb
add -fno-inline from ubuntu package
2013-04-29 15:31:55 -04:00
Isaac Connor
1c3f6a9637
fix typos
2013-04-29 13:45:27 -04:00
Isaac Connor
0967797933
add unistd.h to fix compile
2013-04-29 13:44:21 -04:00
Isaac Connor
6db183a5ba
add mathetmatics.h to fix compile
2013-04-29 13:43:48 -04:00
Isaac Connor
bd5e2da5c7
fix for kernel3.5
2013-04-29 13:29:51 -04:00
Isaac Connor
84370b7fd8
add unistd.h include to fix compile
2013-04-29 12:51:46 -04:00
nextime
8bf1824159
Ok, this time it will work?
2013-04-27 02:17:11 +02:00
nextime
7cb43d0efc
Fix a wrong macro..
2013-04-27 01:10:51 +02:00
nextime
6af58aca09
Fix CodecID changes in recent libav libraries
2013-04-27 00:59:34 +02:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Kfir Itzhak
0ef29743f2
Merged the deinterlacing code, although only four field is optimized so far, and is still not working perfectly.
...
1) Fixed compile errors that may occur when compiling with gcc 4.7 or newer.
2) Modified the check for libavcodec to work correctly with the latest versions of ffmpeg.
2012-07-17 12:23:13 +03:00
