AEtHeLsYn 9db45c0ffb Merge remote-tracking branch 'refs/remotes/tvdzwan/master' ... # Conflicts: # include/hyperion/Hyperion.h # libsrc/hyperion/CMakeLists.txt # libsrc/hyperion/Hyperion.cpp Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e		2016-03-09 19:25:04 +01:00
..
amlogic	prepare standalone amlogic grabber	2016-02-24 14:42:25 +01:00
dispmanx	Merge remote-tracking branch 'refs/remotes/tvdzwan/master'	2016-03-09 19:25:04 +01:00
framebuffer	implement proto forwarding for osxgrabber and framebuffer. prepare forwarding in amlogic and dispmanx	2016-02-17 00:44:06 +01:00
osx	implement proto forwarding for osxgrabber and framebuffer. prepare forwarding in amlogic and dispmanx	2016-02-17 00:44:06 +01:00
v4l2	implement proto forwarding for hyperiond internal v4l2 grabber	2016-02-16 15:41:40 +01:00
x11	Update X11Grabber.cpp	2016-01-21 16:51:20 +01:00
CMakeLists.txt	Added code for amlogic grabber.	2015-08-07 14:37:41 +02:00