Isaac Connor
|
d936312207
|
revert
|
2016-04-25 16:46:23 -04:00 |
|
Isaac Connor
|
851e8f46ff
|
redo fix_rotate
|
2016-04-25 15:57:39 -04:00 |
|
Isaac Connor
|
26a45d5fa9
|
Don't rotate dimensions when constructing the monitor because they are already rotated
|
2016-04-25 13:55:28 -04:00 |
|
Isaac Connor
|
44f32f46b7
|
deprecate zmdbFetchOne in favor of zmDbRow
|
2016-04-20 11:56:58 -04:00 |
|
Isaac Connor
|
2fcdee87d9
|
Merge branch 'storageareas' into valgrind
|
2016-04-20 10:01:30 -04:00 |
|
Isaac Connor
|
71d79fac99
|
Merge ../ZoneMinder.SteveGilvarry into valgrind
|
2016-04-20 09:59:08 -04:00 |
|
Isaac Connor
|
d2870f0692
|
move the mysql_free_result, looks like we can't free it until we free the row
|
2016-04-20 09:44:11 -04:00 |
|
Isaac Connor
|
98fa65310b
|
whitespace changes
|
2016-04-17 09:29:00 -04:00 |
|
Isaac Connor
|
d6f640907f
|
add avformat_network_init
|
2016-04-17 09:28:43 -04:00 |
root
|
72bf8ac2b8
|
up the debug level for Have Keyframe
|
2016-04-16 15:13:36 -04:00 |
|
Isaac Connor
|
111b1a1566
|
add back lastKeyframePkt
|
2016-04-15 15:23:22 -04:00 |
|
Isaac Connor
|
db52a61b01
|
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
|
2016-04-15 15:22:58 -04:00 |
|
Isaac Connor
|
f1e69463b6
|
More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash
|
2016-04-15 15:22:47 -04:00 |
|
Isaac Connor
|
1e8450ecbf
|
av_set_parameters was deprecated a long time ago
|
2016-04-15 12:50:05 -04:00 |
|
Isaac Connor
|
21b35c4df0
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-14 22:12:52 -04:00 |
|
Isaac Connor
|
b19f990147
|
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
|
2016-04-14 22:12:49 -04:00 |
|
Isaac Connor
|
3e683e3002
|
Add a call to av_set_parameters, found some code that says it must be called
|
2016-04-14 22:12:34 -04:00 |
|
Isaac Connor
|
bcec1813e6
|
More return value checking/commenting
|
2016-04-14 21:54:17 -04:00 |
|
Isaac Connor
|
c7dceafd67
|
fix first param to zm_dump_stream_format
|
2016-04-14 12:42:47 -04:00 |
|
Isaac Connor
|
30066f788d
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-04-14 12:35:21 -04:00 |
|
Isaac Connor
|
c189e60d9b
|
add some comments, and dump filename and AVFormatContext on failure to write header
|
2016-04-14 12:34:52 -04:00 |
|
Isaac Connor
|
fb48c909ce
|
Merge branch 'log_include_mId' into storageareas
|
2016-04-12 08:42:38 -04:00 |
|
Isaac Connor
|
2724b10163
|
Include mId in syslog logging.
|
2016-04-12 08:42:12 -04:00 |
Andrew Bauer
|
28b30ecb47
|
Merge pull request #1377 from ZoneMinder/random_fixes
Random fixes
|
2016-04-11 12:04:05 -05:00 |
|
Isaac Connor
|
61bd60184a
|
Merge branch 'random_fixes' into storageareas
|
2016-04-11 11:28:24 -04:00 |
|
Isaac Connor
|
7c0f524e1f
|
Merge branch 'master' into random_fixes
|
2016-04-11 11:24:41 -04:00 |
|
Isaac Connor
|
e1cbaed2a3
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 12:50:46 -04:00 |
|
Isaac Connor
|
fefa2dc804
|
add a test and error message if the codec is not h264
|
2016-04-06 12:48:16 -04:00 |
|
Isaac Connor
|
dc7f2ff353
|
fix merge problems
|
2016-04-06 11:44:57 -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
|
765f79a87f
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 11:16:38 -04:00 |
|
Isaac Connor
|
2a6071561d
|
use zm_dump_stream_format to dump information about the packet to the log
|
2016-04-06 10:51:58 -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
|
2f1376950a
|
spelling fix
|
2016-04-06 10:50:12 -04:00 |
|
Isaac Connor
|
9aeba8ced8
|
whitespace fixes
|
2016-04-06 10:50:00 -04:00 |
|
Isaac Connor
|
0ef02287dd
|
revert
|
2016-04-06 10:49:42 -04:00 |
|
Isaac Connor
|
222f7755fe
|
fix whitespace
|
2016-04-06 10:27:41 -04:00 |
|
Isaac Connor
|
30d2b475eb
|
increase log level on some success debug statements
|
2016-04-06 08:39:33 -04:00 |
|
Isaac Connor
|
a92764f71a
|
check return codes and report errors when writing trailer and closing file
|
2016-04-06 08:39:09 -04:00 |
|
Isaac Connor
|
dd408cc9a1
|
Don't skip audo stream detection by finding video stream
|
2016-04-06 08:38:34 -04:00 |
|
Isaac Connor
|
4bc200f839
|
fix merge
|
2016-04-06 08:38:10 -04:00 |
|
Isaac Connor
|
9d9369db6f
|
Don't skip audio stream by finding a video stream
|
2016-04-06 08:37:28 -04:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
04800afaf5
|
Some documenting comments and debug lines, mostly just trying to understand what the code does
|
2016-04-05 12:30:22 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
|
Isaac Connor
|
f1331df4d9
|
Use != instead of == when checking dts tiemscale stuff
|
2016-04-05 09:01:54 -04:00 |
SteveGilvarry
|
4d7ded5ef0
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
|
2016-04-05 22:06:14 +10:00 |
|
Isaac Connor
|
be13e56c3c
|
add some comments
|
2016-04-04 21:58:16 -04:00 |
|
Andy Bauer
|
4e9a925933
|
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
|
2016-04-04 20:52:49 -05:00 |