66c78e5a9b
Merge branch 'zma_to_thread' into rtsp_server
2021-01-19 13:43:25 -05:00
824cbb7879
spacing and NULL=>nullptr
2021-01-11 13:46:50 -05:00
705959d1ec
Set codec_type in zm_packet
2021-01-11 13:46:50 -05:00
7afaf00202
spacing and NULL=>nullptr
2021-01-07 09:36:54 -05:00
08a28e6960
Set codec_type in zm_packet
2021-01-06 11:30:03 -05:00
63687c8e44
code style
2020-12-27 11:57:50 -05:00
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
3641797500
Merge branch 'master' into zma_to_thread
2020-07-22 13:14:40 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
ae5116ff9c
improve efficiency of outputting device query. The constant strlen's were terrible.
2020-06-15 15:29:26 -04:00
e98f422730
Use %d for values that are actually integer in debug statements
2020-03-26 15:04:28 -04:00
448294f593
wip
2019-02-25 10:21:43 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
730ced60d8
specify which input we are setting standard on. Not sure it is required, but the api docs do it
2019-01-10 12:08:51 -05:00
4a82f460b2
add some parenthesis to make logic at more clear if not more correct. Potentially fix #2405
2019-01-09 16:39:53 -05:00
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
9f183f5df7
google code style, improve debugging, add bandwidth code
2018-08-09 11:23:13 -04:00
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
3130a21a28
google code style
2018-04-12 10:23:20 -04:00
84b42ef4d7
workarouns for omx
2018-02-22 11:43:04 -05:00
399b5159a4
spacing and comment out some debug. Also maybe fix build when v4l1 is not present
2018-02-15 14:07:40 -05:00
bcdadc67bf
Merge branch 'storageareas' into zma_to_thread
2017-12-12 15:29:19 -05:00
c40f79097d
fix zeroing of vid_cap, when we want to zero vid_pic!
2017-12-12 13:28:39 -05:00
fe8e1ba445
change the order of open/stat. Only stat and check for char device if we can actualy open it
2017-12-12 13:01:38 -05:00
8c1159ad56
quiet coverity by initializing everything in constructor
2017-12-12 12:37:36 -05:00
b1019267d8
try moving codec selection up above ctx allocation so that it allocates a priv_data
2017-12-02 08:12:04 -05:00
2e3fda488e
more debug
2017-12-01 14:33:51 -05:00
0865201e1e
seems to work
2017-12-01 07:26:34 -05:00
6e4abf83d0
wip
2017-11-28 08:29:03 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
4217d8ec4d
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2017-11-17 16:49:31 -05:00
28286c7967
fix spacing
2017-11-17 16:49:28 -05:00
cd596d49e3
fix local camera inputstream
2017-11-17 16:49:01 -05:00
ef5e296144
some fixes
2017-11-17 14:30:38 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
57c8cdde63
Merge branch 'storageareas' into put_ffmpeg_into_event_wip
2017-11-14 02:45:34 -05:00
65e7fb0014
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:40:12 -05:00
ed72017684
add a mutex
2017-11-13 14:35:47 -05:00
75743d63b6
fixes
2017-11-12 17:02:11 -05:00
ecd86b3fde
cleanup
2017-11-12 15:18:39 -05:00
f476c8f2e5
fixes from cppcheck
2017-11-12 13:25:19 -05:00
ef0f01d498
more debug, try to get pts/dts right
2017-11-12 13:16:40 -05:00
Isaac Connor
Peter Keresztes Schmidt
Isaac Connor
Isaac Connor