v4l2/exemple.txt

@@ -1,42 +0,0 @@
--- v4l2_capability, /dev/video0      0x7ffeee718100
-   driver          cx231xx
-   card            Pixelview Xcapture USB
-   bus info        usb-0000:00:1a.0-1.2
-   version         0x41325
-   capabilities    0x85200011
-     vcapt vbicapt extpix rwsysc stream 
-   device caps     0x5200001
--- inputs enumeration 'on peut voir quoi ?'
-Composite1                       | camera    
-S-Video                          | camera    
--- v4l2_format, Experimental     0x7ffeee718030
-   type 1          video capture
-   dims            720x576
-   pixformat       [YUYV]
-   field           4
-   padding         1440
-   sizeimage       829440
-   colorspace      1  smpte170m
--- image formats enumeration (Experimental)
-  0  vidcapt    0x00   [YUYV]   YUYV 4:2:2                       
--- controls enumeration 'is that working ?'
-  Brightness                         integer     [0..255]
-  Contrast                           integer     [0..127]
-  Saturation                         integer     [0..127]
-  Hue                                integer     [-128..127]
-  Volume                             integer     [0..65535]
-  Balance                            integer     [0..65535]
-  Bass                               integer     [0..65535]
-  Treble                             integer     [0..65535]
-  Mute                               boolean     [0..1]
--- extended controls enumeration 'looking for extended'
-  User Controls                      ctrl-class  [0..0]
-  Brightness                         integer     [0..255]
-  Contrast                           integer     [0..127]
-  Saturation                         integer     [0..127]
-  Hue                                integer     [-128..127]
-  Volume                             integer     [0..65535]
-  Balance                            integer     [0..65535]
-  Bass                               integer     [0..65535]
-  Treble                             integer     [0..65535]
-  Mute                               boolean     [0..1]

v4l2/grabvidseq.c

@@ -36,12 +36,6 @@
 #define SAVE_AS_PNM	0
 #define SAVE_AS_FIMG	0
 
-<<<<<<< HEAD
-=======
-#define		WIDTH		720
-#define		HEIGHT		576
-
->>>>>>> 776c3e9dbda446198f7d90b4918ab3a642773239
 /* --------------------------------------------------------------------- */
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))