redpanther
|
c7df8c23c6
|
Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id
Conflicts:
src/hyperion-aml/CMakeLists.txt
src/hyperion-remote/CMakeLists.txt
src/hyperion-v4l2/CMakeLists.txt
Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb
|
2016-03-13 08:04:49 +01:00 |
|
redpanther
|
e01bcd708d
|
add install commands
instead of "make" use "make install/strip" release compile
Former-commit-id: f4dd2d9e1a4d815b667665892a3bd9cec64218a3
|
2016-03-10 12:22:44 +01:00 |
|
redpanther
|
e6170ed698
|
create external framebuffer grabber
cleanup some cmakelist files
fix qt5 build
Former-commit-id: 024b5b6dc5dc96fcb16f6e8958ad3684a6728504
|
2016-03-09 07:03:17 +01:00 |
|
frostworx
|
defe217c89
|
added optional QT5 support - LedDevicePhilipsHue needs proper fixes
Former-commit-id: 7f0971ccda221933da4be836628532e7cfc7c085
|
2016-01-06 17:31:23 +01:00 |
|
poljvd
|
d89f504d83
|
Refactor V4L2 and X11 grabbers to share more code
Former-commit-id: 46176e53d1acf39f9bd0c0ecbb8e5fb5ab4d45be
|
2014-11-21 21:24:33 +01:00 |
|
poljvd
|
dd1adc4e90
|
Merge pull request #73 from lobocobra/patch-1
Fix error in start script
Former-commit-id: 6a02b865c86befa29e970a7465b256cde5335e95
|
2014-04-11 19:52:33 +02:00 |
|
johan
|
69d6e47328
|
Create image callback using Qt signal
Former-commit-id: cf469ba01ffd26d286e6fb8d9f081cf126042e50
|
2014-02-19 21:52:37 +01:00 |
|
johan
|
f0c35071da
|
Move V4L2 grabber code to separate library
Former-commit-id: f3003eb0142af3d085ccf93fff1b297ebc2321fc
|
2014-02-07 21:11:50 +01:00 |
|
Johan
|
c5b18d5925
|
Removed use of qt4_use_modules from build files
Former-commit-id: 49860cd93e1492a2c67bd2a84bd082713a0c8e9b
|
2014-02-07 09:20:00 +01:00 |
|
johan
|
305a2e856a
|
Added signal detection option
Former-commit-id: 1bd70d02814d6238c488db765d9d25af655c1872
|
2014-01-26 16:00:33 +01:00 |
|
johan
|
4f7997bbfe
|
Switched json to proto
Former-commit-id: 1a1c70b93c9b4efe17f1c1d2da246c949affa1f0
|
2014-01-25 21:00:48 +01:00 |
|
johan
|
6723c7bf2b
|
Moved test/v4l2_to_png to src/hyperion-v4l2; Added json backend temporarily
Former-commit-id: 8c4e0ef7add8016c522d0b4c6f4df8886b905e36
|
2014-01-25 17:35:06 +01:00 |
|