Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ...

Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...

2012-06-25 14:53:09 -07:00

..

.gitignore

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

biblio.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

capture.c.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

common.xml

[media] V4L2: Mark the DV Preset API as deprecated

2012-05-20 08:31:52 -03:00

compat.xml

[media] V4L2: Mark the DV Preset API as deprecated

2012-05-20 08:31:52 -03:00

controls.xml

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-05-24 10:21:51 -07:00

crop.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

dev-capture.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-codec.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-effect.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-event.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-osd.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-output.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-overlay.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-radio.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-raw-vbi.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-rds.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-sliced-vbi.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

dev-subdev.xml

[media] v4l: Add subdev selections documentation

2012-04-10 17:11:27 -03:00

dev-teletext.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

driver.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

fdl-appendix.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

fieldseq_bt.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

fieldseq_tb.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

func-close.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-ioctl.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-mmap.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-munmap.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-open.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-poll.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-read.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-select.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

func-write.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

gen-errors.xml

[media] v4l2 core: return -ENOTTY if an ioctl doesn't exist

2011-07-27 17:53:38 -03:00

io.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

keytable.c.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

libv4l.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

lirc_device_interface.xml

[media] DocBook: Add return error codes to LIRC ioctl session

2011-07-27 17:53:36 -03:00

media-controller.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

media-func-close.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

media-func-ioctl.xml

[media] DocBook: Remove V4L generic error description for ioctl()

2011-07-27 17:53:36 -03:00

media-func-open.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

media-ioc-device-info.xml

[media] DocBook: Use the generic error code page also for MC API

2011-07-27 17:53:35 -03:00

media-ioc-enum-entities.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

media-ioc-enum-links.xml

[media] v4l: Fix minor typos in the documentation

2011-07-27 17:53:10 -03:00

media-ioc-setup-link.xml

[media] DocBook/media-ioc-setup-link.xml: Remove EBUSY

2011-07-27 17:53:35 -03:00

pipeline.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

pixfmt-grey.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-m420.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-nv12.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-nv12m.xml

[media] V4L: DocBook: Fix typos in the multi-plane formats description

2012-04-19 09:05:51 -03:00

pixfmt-nv12mt.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-nv16.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-nv24.xml

v4l: Add V4L2_PIX_FMT_NV24 and V4L2_PIX_FMT_NV42 formats

2011-12-19 20:07:13 +00:00

pixfmt-packed-rgb.xml

[media] v4l: Add new alpha component control

2011-12-30 14:05:08 -02:00

pixfmt-packed-yuv.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-sbggr8.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-sbggr16.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-sgbrg8.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-sgrbg8.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-srggb8.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

pixfmt-srggb10.xml

[media] v4l: Add DPCM compressed raw bayer pixel formats

2012-05-14 08:43:27 -03:00

pixfmt-srggb10dpcm8.xml

[media] v4l: Add DPCM compressed raw bayer pixel formats

2012-05-14 08:43:27 -03:00

pixfmt-srggb12.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

pixfmt-uyvy.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-vyuy.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-y10.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

pixfmt-y10b.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

pixfmt-y12.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

pixfmt-y16.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-y41p.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-yuv410.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-yuv411p.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-yuv420.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-yuv420m.xml

[media] V4L: DocBook: Fix typos in the multi-plane formats description

2012-04-19 09:05:51 -03:00

pixfmt-yuv422p.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-yuyv.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt-yvyu.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

pixfmt.xml

[media] bw-qcam: driver and pixfmt documentation fixes

2012-06-11 18:16:09 -03:00

planar-apis.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

remote_controllers.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

selection-api.xml

[media] V4L: Improve the selection API documentation

2012-03-19 15:33:24 -03:00

subdev-formats.xml

[media] v4l: Fix minor typos in the documentation

2011-07-27 17:53:10 -03:00

subdev-image-processing-crop.dia

[media] v4l: Add subdev selections documentation: svg and dia files

2012-04-10 17:11:21 -03:00

subdev-image-processing-crop.svg

[media] v4l: Add subdev selections documentation: svg and dia files

2012-04-10 17:11:21 -03:00

subdev-image-processing-full.dia

[media] v4l: Add subdev selections documentation: svg and dia files

2012-04-10 17:11:21 -03:00

subdev-image-processing-full.svg

[media] v4l: Add subdev selections documentation: svg and dia files

2012-04-10 17:11:21 -03:00

subdev-image-processing-scaling-multi-source.dia

[media] v4l: Add subdev selections documentation: svg and dia files

2012-04-10 17:11:21 -03:00

subdev-image-processing-scaling-multi-source.svg

[media] v4l: Add subdev selections documentation: svg and dia files

2012-04-10 17:11:21 -03:00

v4l2.xml

[media] V4L2 spec fix

2012-06-11 15:50:47 -03:00

v4l2grab.c.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vbi_525.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vbi_625.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vbi_hsync.pdf

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vidioc-create-bufs.xml

[media] V4L2 spec fix

2012-06-11 15:50:47 -03:00

vidioc-cropcap.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-dbg-g-chip-ident.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-dbg-g-register.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-decoder-cmd.xml

[media] Fix small DocBook typo

2012-03-08 12:13:18 -03:00

vidioc-dqevent.xml

[media] Fix VIDIOC_DQEVENT docbook entry

2012-06-18 19:50:07 -03:00

vidioc-dv-timings-cap.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-encoder-cmd.xml

[media] v4l spec: document VIDIOC_(TRY_)DECODER_CMD

2012-02-14 13:42:34 -02:00

vidioc-enum-dv-presets.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-enum-dv-timings.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-enum-fmt.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-enum-frameintervals.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-enum-framesizes.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-enumaudio.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-enumaudioout.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-enuminput.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-enumoutput.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-enumstd.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

vidioc-g-audio.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-g-audioout.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-g-crop.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-g-ctrl.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

vidioc-g-dv-preset.xml

[media] V4L2: Mark the DV Preset API as deprecated

2012-05-20 08:31:52 -03:00

vidioc-g-dv-timings.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-g-enc-index.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-g-ext-ctrls.xml

[media] V4L: JPEG class documentation corrections

2012-05-15 11:41:00 -03:00

vidioc-g-fbuf.xml

[media] v4l2 spec: clarify usage of V4L2_FBUF_FLAG_OVERLAY

2012-01-16 09:35:55 -02:00

vidioc-g-fmt.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-g-frequency.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-g-input.xml

[media] V4L2 Spec: improve the G/S_INPUT/OUTPUT documentation

2012-01-16 09:38:29 -02:00

vidioc-g-jpegcomp.xml

[media] V4L: Add JPEG compression control class documentation

2012-02-28 18:54:06 -03:00

vidioc-g-modulator.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

vidioc-g-output.xml

[media] V4L2 Spec: improve the G/S_INPUT/OUTPUT documentation

2012-01-16 09:38:29 -02:00

vidioc-g-parm.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-g-priority.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

vidioc-g-selection.xml

[media] V4L: Improve the selection API documentation

2012-03-19 15:33:24 -03:00

vidioc-g-sliced-vbi-cap.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-g-std.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

vidioc-g-tuner.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-log-status.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-overlay.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-prepare-buf.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-qbuf.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-query-dv-preset.xml

[media] V4L2: Mark the DV Preset API as deprecated

2012-05-20 08:31:52 -03:00

vidioc-query-dv-timings.xml

[media] V4L2 spec: document the new V4L2 DV timings ioctls

2012-05-20 08:18:03 -03:00

vidioc-querybuf.xml

[media] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02:00

vidioc-querycap.xml

[media] V4L2: Add per-device-node capabilities

2012-01-23 16:34:27 -02:00

vidioc-queryctrl.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-querystd.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-reqbufs.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-s-hw-freq-seek.xml

[media] v4l2: use __u32 rather than enums in ioctl() structs

2012-05-14 08:09:02 -03:00

vidioc-streamon.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-subdev-enum-frame-interval.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vidioc-subdev-enum-frame-size.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vidioc-subdev-enum-mbus-code.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vidioc-subdev-g-crop.xml

[media] v4l: Mark VIDIOC_SUBDEV_G_CROP and VIDIOC_SUBDEV_S_CROP obsolete

2012-04-10 17:12:13 -03:00

vidioc-subdev-g-fmt.xml

[media] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -03:00

vidioc-subdev-g-frame-interval.xml

[media] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -03:00

vidioc-subdev-g-selection.xml

[media] v4l: Add subdev selections documentation

2012-04-10 17:11:27 -03:00

vidioc-subscribe-event.xml

[media] v4l: events: Define V4L2_EVENT_FRAME_SYNC

2011-08-29 12:37:15 -03:00