ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,660 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

35 Commits

Author SHA1 Message Date
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Steve Gilvarry 1a684b7709 Remove whitespace 2016-07-28 23:22:34 +10:00
Steve Gilvarry 71e3789bd0 Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport 2016-07-28 23:15:01 +10:00
Steve Gilvarry 8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Jon Burgess bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
SteveGilvarry 2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
SteveGilvarry e70d037895 Start avpicture deprecation 2016-02-27 01:23:20 +11:00
SteveGilvarry 5ba13f1a76 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
 2015-11-04 16:24:39 +11: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
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
Emmanuel Papin a36b4aa65d Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 
haven't attempted to build yet, there are some changes
 2015-05-17 17:18:54 -07:00
Dmitry Smirnov eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Sune1337 5779b2e20f * use pthread_join instead of pthread_tryjoin_np 2015-04-08 22:15:54 +02:00
SteveGilvarry 6cb96f1316 Put opts back in 2014-10-12 16:47:27 +11:00
Sune1337 7534557533 - join reconnect thread when finished to clean up thread resources. 
- don't spawn a new thread for every attempt to open a stream while reconnecting.
 2014-10-12 16:31:27 +11:00
Sune1337 a865a555f2 Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists. 2014-10-12 16:31:27 +11:00
Sune1337 f32b1276df Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined. 2014-10-12 16:23:58 +11:00
Sune1337 83d2a494c3 Process should exit if ReopenFfmpeg function fails to create a worker thread. 2014-10-12 16:23:58 +11:00
Sune1337 7de59df080 removed use of av_err2str. someone could not compile when using that macro. 2014-10-12 16:23:58 +11:00
Sune1337 a307b8a1e3 Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file. 2014-10-12 16:23:58 +11:00
Sune1337 ebf466c2df - Timeout when opening stream after 10 seconds 
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
 2014-10-12 16:23:58 +11:00
Andy Bauer 549360cabd Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements 
Conflicts:
	src/zm_ffmpeg.h
	src/zm_mpeg.cpp
 2014-10-11 15:38:38 -05:00
m-bene a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene 9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene 1b4f9c082c change check for av_dict_set success 2014-05-15 16:01:29 +02:00
m-bene 6016206f98 modify debug message 2014-05-15 15:42:27 +02:00
m-bene 5cb7cd916f add quotes to option debug/warn messages 2014-05-15 15:13:39 +02:00
m-bene c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02:00
m-bene ae0ee9b3b3 testing/fixing 2014-05-05 15:54:13 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Sune1337 3155d621d0 - Removed an unreferenced variable 
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
 2014-04-25 22:57:29 +02:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00