config.h.in                                        |    9 +
 configure                                          |   11 +-
 configure.ac                                       |    4 +-
 db/zm_create.sql.in                                |    1 +
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in |    6 +-
 scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in     |   75 +-
 src/Makefile.am                                    |    2 +-
 src/Makefile.in                                    |    2 +-
 src/zm_camera.cpp                                  |   15 +-
 src/zm_camera.h                                    |    8 +-
 src/zm_config_defines.h                            |    6 +-
 src/zm_event.cpp                                   |   57 +-
 src/zm_ffmpeg_camera.cpp                           |  103 +-
 src/zm_ffmpeg_camera.h                             |    8 +-
 src/zm_file_camera.cpp                             |    4 +-
 src/zm_file_camera.h                               |    2 +-
 src/zm_image.cpp                                   | 3024 +++++++++++++++++---
 src/zm_image.h                                     |  155 +-
 src/zm_local_camera.cpp                            |  925 +++---
 src/zm_local_camera.h                              |   26 +-
 src/zm_mem_utils.h                                 |   38 +
 src/zm_monitor.cpp                                 |  178 +-
 src/zm_monitor.h                                   |   77 +-
 src/zm_mpeg.cpp                                    |    4 +-
 src/zm_mpeg.h                                      |    2 +-
 src/zm_remote_camera.cpp                           |    4 +-
 src/zm_remote_camera_http.cpp                      |    6 +-
 src/zm_remote_camera_rtsp.cpp                      |  251 +-
 src/zm_remote_camera_rtsp.h                        |   18 +-
 src/zm_rgb.h                                       |  129 +-
 src/zm_stream.cpp                                  |    2 +-
 src/zm_thread.h                                    |   26 +-
 src/zm_utils.cpp                                   |   94 +
 src/zm_utils.h                                     |    5 +
 src/zm_zone.cpp                                    |   78 +-
 src/zma.cpp                                        |    2 +
 src/zmc.cpp                                        |    2 +
 src/zmf.cpp                                        |    2 +
 src/zms.cpp                                        |    2 +
 src/zmstreamer.cpp                                 |    2 +
 web/includes/actions.php                           |    6 +-
 web/skins/classic/views/js/monitor.js.php          |    8 +-
 web/skins/classic/views/monitor.php                |   93 +-
 web/skins/classic/views/monitorprobe.php           |   22 +-
 44 files changed, 4090 insertions(+), 1404 deletions(-)