diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-31 17:00:58 +0200 |
commit | d087d778ffb62e2713cb848540bcc819470365bd (patch) | |
tree | d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/stv680.h | |
parent | c8bd2513ecba169cff44c09c8058c36987357b18 (diff) | |
parent | 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/stv680.h')
-rw-r--r-- | backend/stv680.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backend/stv680.h b/backend/stv680.h index e08976b..a4f5fbe 100644 --- a/backend/stv680.h +++ b/backend/stv680.h @@ -2,10 +2,10 @@ Copyright (C) 2004 -2006 Gerard Klaver (gerard at gkall dot hobby dot nl) - The teco2 and gl646 backend (Frank Zago) are used as a template for + The teco2 and gl646 backend (Frank Zago) are used as a template for this backend. - - For the usb commands and bayer decoding parts of the following + + For the usb commands and bayer decoding parts of the following program are used: The pencam2 program (GNU GPL license 2) @@ -13,7 +13,7 @@ The libgphoto2 (camlib stv0680) (GNU GPL license 2) The stv680.c/.h kernel module (GNU GPL license 2) - For the stv680_add_text routine the add_text routine and font_6x11.h file + For the stv680_add_text routine the add_text routine and font_6x11.h file are taken from the webcam.c file, part of xawtv program, (c) 1998-2002 Gerd Knorr (GNU GPL license 2). @@ -36,7 +36,7 @@ --------------------------------------------------------------------- */ -/* +/* $Id$ update 20-04-2006*/ @@ -94,8 +94,8 @@ enum Stv680_Option /*--------------------------------------------------------------------------*/ -/* - * Video Camera supported by this backend. +/* + * Video Camera supported by this backend. */ struct vidcam_hardware { @@ -207,7 +207,7 @@ Stv680_Vidcam; /*--------------------------------------------------------------------------*/ -/* Debug levels. +/* Debug levels. * Should be common to all backends. */ #define DBG_error0 0 |