frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge_v4l2

Browse Source 
Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
This commit is contained in:
johan
2014-02-23 21:36:39 +01:00
parent 22472d8f95 1a92e6ccd2
commit e58f84d5c8
10 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/grabber/V4L2Grabber.h
View File

@@ -13,6 +13,9 @@
#include <utils/ColorRgb.h>
#include <utils/VideoMode.h>
// grabber includes
#include <grabber/VideoStandard.h>
/// Capture class for V4L2 devices
///
/// @see http://linuxtv.org/downloads/v4l-dvb-apis/capture-example.html
@@ -20,11 +23,6 @@ class V4L2Grabber : public QObject
{
Q_OBJECT
public:
enum VideoStandard {
PAL, NTSC, NO_CHANGE
};
public:
V4L2Grabber(
const std::string & device,