Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / cinelerra / devicev4l2base.inc

diff --git a/cinelerra-5.0/cinelerra/devicev4l2base.inc b/cinelerra-5.0/cinelerra/devicev4l2base.inc
deleted file mode 100644 (file)
index f7088c5..0000000
--- a/cinelerra-5.0/cinelerra/devicev4l2base.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
- * CINELERRA
- * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- */
-
-#ifndef DEVICEV4L2BASE_INC
-#define DEVICEV4L2BASE_INC
-
-// Short delay is necessary whenn capturing a lousy source.
-//#define V4L2_BUFFER_TIMEOUT 250000
-
-// Long delay is necessary to avoid losing synchronization due to spurrious
-// resets.
-#define V4L2_BUFFER_TIMEOUT 10000000
-
-class DeviceV4L2Base;
-
-
-#endif