Commit Graph

13 Commits

Author SHA1 Message Date
Isaac Connor 284b9f963f Merge branch 'master' into zma_to_thread 2020-12-29 12:18:26 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor 9713a2ec00 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-11-17 11:09:31 -05:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Peter Keresztes Schmidt 8f980a1168 Convert NULL/0 to nullptr
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread 2020-07-21 17:38:32 -04:00
hax0kartik 6886b2b375 Modify Convert to scale as well 2020-03-28 15:17:19 -07:00
Isaac Connor cd3046abb3 Merge branch 'storageareas' into zma_to_thread 2018-04-14 11:03:08 -04:00
Isaac Connor c6635b8096 make swscale more robust by moving bits that can fail into an init function instead of the constructor 2018-04-12 10:24:10 -04:00
Isaac Connor ef5e296144 some fixes 2017-11-17 14:30:38 -05:00
Isaac Connor 3129afa5d6 fixup decoding when recording from a non-ffmpeg suorce 2017-11-14 13:16:07 -08:00
Isaac Connor 39b12057f2 add saveJPEGs to Events 2017-11-13 21:34:39 -05:00
Isaac Connor a4cf47b5c3 move swscale into it's own files 2017-08-23 15:06:12 -04:00