mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 06:48:00 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,088 Commits 80 Branches 104 Tags
808d070414410a84f04533e2a4cdf8fd5c8a260c
Commit Graph

47 Commits

Author SHA1 Message Date
Isaac Connor
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
3f713df826 bump libavutil version check as per @SteveGilvarry 2016-08-09 13:14:10 -04:00
Isaac Connor
177c2c741b Fixes #1584. I've just copied the relevant functions from ffmpeg source. Please review carefully before merging. 2016-08-07 10:55:19 -04:00
Isaac Connor
f99f394a3d hopefully fixup zm_av_packet_ref for libavtools 2016-05-25 21:05:08 -04:00
Isaac Connor
4b5af390fd merge 2016-09-21 12:44:27 -04:00
Isaac Connor
f5405a4131 clearer debug output 2016-09-21 11:57:42 -04:00
Isaac Connor
4359c65601 better debugging of timebase 2016-09-21 10:56:09 -04:00
Isaac Connor
288b03290c remark out some debugging 2016-09-21 09:05:55 -04:00
Isaac Connor
61df6e9d75 Work on aac encoding 2016-09-16 15:54:13 -04:00
Isaac Connor
a6b23f50d5 Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 10:21:14 -04:00
Isaac Connor
59b28e8346 deprecate the z_frame_rate stuff which is deprecated in ffmpeg 2016-09-13 10:15:47 -04:00
Isaac Connor
2bc5742aec Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 09:53:39 -04:00
Isaac Connor
19d46c2d09 Merge branch 'master' into storageareas 2016-08-15 10:45:50 -04:00
Steve Gilvarry
b9a48eb464 Pass swscale_ctx back in to getCachedContext or it will create new 
context every frame and leak memory like a mofo.
 2016-07-17 08:11:53 +10:00
Isaac Connor
26369268bb merge Steve's updates, work on zmaudit 2016-07-12 11:27:25 -04:00
Steve Gilvarry
5d2ece0063 Why are these failing 2016-07-10 11:57:08 +10:00
Steve Gilvarry
25f7a8cadf Restore lost fixes for deprecation 2016-07-09 22:31:01 +10:00
Isaac Connor
7496dc392f get rid of use of separator, just use \n 2016-06-21 14:06:07 -04:00
Isaac Connor
e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor
6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Isaac Connor
26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor
98fab6528d always use \n as separator and remove the segfault 2016-06-13 14:00:24 -04:00
Isaac Connor
c3628a8dfd Merge branch 'updated-console' into storageareas 2016-05-03 14:34:58 -04:00
Steve Gilvarry
da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Steve Gilvarry
8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Isaac Connor
337d8a748c simplify the separator stuff 2016-04-28 12:56:19 -04:00
Isaac Connor
71d79fac99 Merge ../ZoneMinder.SteveGilvarry into valgrind 2016-04-20 09:59:08 -04:00
Isaac Connor
d83ab4d46c Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines 2016-04-06 11:25:05 -04:00
Isaac Connor
9dd1c8cb4a add some packet dumping functions, stolen from ffmpeg, but these will use our logging functions 2016-04-06 10:51:20 -04:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
SteveGilvarry
2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
Heng Liu
4e263f5913 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg.h
 2015-11-04 14:39:52 -08:00
SteveGilvarry
51914994f7 Migrating from av_free/av_freep to av_frame_free using libavcodec version 
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
 2015-11-04 15:30:14 +11:00
SteveGilvarry
bc5ef6c599 Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version 
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
 2015-11-04 12:46:26 +11:00
Dmitry Smirnov
0ff7a4e616 Replace deprecated FFmpeg API 
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.

Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
 2015-11-03 11:58:23 +11:00
Isaac Connor
1e60fccd81 Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0 
Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog
 2015-07-28 21:39:47 +10:00
SteveGilvarry
9b06b1399c Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php
 2015-06-10 23:09:30 +10:00
Emmanuel Papin
a36b4aa65d Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
Isaac Connor
69090563d5 Merge branch 'master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-11-28 14:23:05 -05:00
Sune1337
04b8ecf0a7 Support streaming with zms (using ffmpeg) better 
* ZoneMinder compiles with ffmpeg 0.5..master
    * Make VideoStream class able to stream through ffmpeg better.
    * Ability to use fixed quality instead of fixed bitrate (by specifying bitrate 0...100)
    * Format url parameter supports <format>/<encoder> syntax

Details:
    - Redefine av_err2str to a to avoid compiler warning on newer g++'s
    - When using rtp format; if ffmpeg does not have a default codec, use CODEC_ID_MPEG4. (because this is what the default is as of 2.2 when this code was written)
    - Specify ofc->packet_size if rtp format is requested
    - Video generated in a thread to guarantee a constant fps.
    - Move _AVCODECID definition into zm_ffmpeg.h (and use instead of (AV)CodecID
    - Call avformat_network_init because ffmpeg warns about it beeing required soon.
    - increase VideoStream::video_outbuf_size to 4MiB to be able to encode larger pictures
 2014-04-25 22:12:58 +02:00
Kfir Itzhak
283f71625b Fix serve memory leak 2013-12-20 04:02:19 +02:00
Kfir Itzhak
2b79ff2cbd Initial commit for saving events as videos :) 2013-12-19 18:38:07 +02:00
Kfir Itzhak
d50169c383 Added SWScale wrapper class and FFMPEG PixelFormat match function 2013-11-26 16:34:26 +02:00
stan
e6041e24a7 Uppdated copyright headers 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:33:23 +00:00
stan
f6a029bc4d Updated properties 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2608 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:08:15 +00:00
stan
aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +00:00