33 Commits

Author	SHA1	Message	Date
Isaac Connor	aaf4b37439	spacing, don't need to set packet.size=0	2020-12-07 15:53:09 -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	448294f593	wip	2019-02-25 10:21:43 -05:00
Isaac Connor	28dafd5931	Merge branch 'storageareas' into zma_to_thread	2018-12-26 12:02:00 -05:00
Isaac Connor	36f7e9abb1	Merge h265 and begin work on swsresample	2018-11-21 09:46:14 -05:00
Isaac Connor	b16cd7ec84	Merge branch 'h265' into zma_to_thread	2018-11-20 12:38:17 -05:00
Isaac Connor	cd3046abb3	Merge branch 'storageareas' into zma_to_thread	2018-04-14 11:03:08 -04:00
Isaac Connor	0ea6fd9807	Merge branch 'storageareas' into zma_to_thread	2017-12-19 14:06:58 -05:00
Isaac Connor	887235c746	move dumpPacket to zm_ffmpeg	2017-12-19 09:59:04 -05:00
Isaac Connor	0865201e1e	seems to work	2017-12-01 07:26:34 -05:00
Isaac Connor	f2efc80f22	works?	2017-11-30 14:37:36 -05:00
Isaac Connor	8e494ef431	Merge branch 'storageareas' into zma_to_thread	2017-11-23 08:40:49 -05:00
Isaac Connor	24a0d717c5	wip	2017-11-21 19:55:40 -05:00
Isaac Connor	882563c06e	rename frame to out_frame. Fix problem where we weren't copying from in_frame to out_frame	2017-11-17 18:19:37 -05:00
Isaac Connor	ef5e296144	some fixes	2017-11-17 14:30:38 -05:00
Isaac Connor	159c0a7165	moer cppcheck fixes	2017-11-17 07:52:26 -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
APHW2 MFGENG	043e44d273	fix, must clear the frame	2017-11-13 14:24:28 -08:00
Isaac Connor	ed72017684	add a mutex	2017-11-13 14:35:47 -05:00
Isaac Connor	aee2b148f0	wip	2017-11-13 12:14:57 -05:00
Isaac Connor	0e7f475ce8	merge work from zma_to_thread, but not the zma_to_thread part	2017-11-12 11:42:34 -05:00
Isaac Connor	3dafb5c225	don't delete image when destroying zmpacket	2017-11-11 09:25:13 -05:00
APHW2 MFGENG	626af8d2fb	wip	2017-11-10 10:10:51 -08:00
Isaac Connor	bb116cebd7	wip	2017-11-09 13:37:02 -08:00
APHW2 MFGENG	d15d36f389	rework, compiles, won't open h264	2017-11-09 11:50:20 -08:00
Isaac Connor	3be40bcc99	blah	2017-10-25 13:25:44 -07:00
Isaac Connor	0fbb473dd4	refactoring	2017-10-25 13:06:15 -07:00
Isaac Connor	b58c9d87c3	wip	2017-10-23 09:51:41 -04:00
Isaac Connor	b30e8953dd	starting to rough in adding a frame to zmpacket	2017-09-04 16:36:34 -04:00
Isaac Connor	a81ff85fbb	add ffmpeg decoding of a .mp4 to get the frames	2017-08-23 15:05:44 -04:00
Isaac Connor	f19b3d5505	create zm_packet	2017-02-18 15:22:56 -05:00