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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits)
  [media] as3645a: Fix compilation by including slab.h
  [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c
  [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c
  [media] ds3000: using logical && instead of bitwise &
  [media] v4l2-ctrls: make control names consistent
  [media] DVB: dib0700, add support for Nova-TD LEDs
  [media] DVB: dib0700, add corrected Nova-TD frontend_attach
  [media] DVB: dib0700, separate stk7070pd initialization
  [media] DVB: dib0700, move Nova-TD Stick to a separate set
  [media] : add MODULE_FIRMWARE to dib0700
  [media] DVB-CORE: remove superfluous DTV_CMDs
  [media] s5p-jpeg: adapt to recent videobuf2 changes
  [media] s5p-g2d: fixed a bug in controls setting function
  [media] s5p-mfc: Fix volatile controls setup
  [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test
  [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test
  [media] s5p-fimc: Fix incorrect control ID assignment
  [media] dvb_frontend: Don't call get_frontend() if idle
  [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T
  [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters
  ...

2012-01-18 12:53:54 -08:00

..

.gitignore

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

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

biblio.xml

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

2011-12-11 09:16:53 -02: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] doc: v4l: add documentation for selection API

2012-01-10 23:18:23 -02:00

compat.xml

[media] doc: v4l: add documentation for selection API

2012-01-10 23:18:23 -02:00

controls.xml

[media] v4l: Add new alpha component control

2011-12-30 14:05:08 -02: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] media: DocBook: Fix trivial typo in Sub-device Interface

2011-09-27 09:14:58 -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] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02: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] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02: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] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -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] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02: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

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

2012-01-15 12:49:56 -08: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] doc: v4l: selection: choose pixels as units for selection rectangles

2012-01-10 23:19:57 -02:00

subdev-formats.xml

[media] v4l: Fix minor typos in the documentation

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

v4l2.xml

[media] doc: v4l: add documentation for selection API

2012-01-10 23:18:23 -02: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] V4L: document the new VIDIOC_CREATE_BUFS and VIDIOC_PREPARE_BUF ioctl()s

2011-11-03 18:28:27 -02:00

vidioc-cropcap.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-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-dqevent.xml

[media] v4l: events: Define V4L2_EVENT_FRAME_SYNC

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

vidioc-encoder-cmd.xml

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

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

vidioc-enum-dv-presets.xml

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

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

vidioc-enum-fmt.xml

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

2011-12-11 09:16:53 -02: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] Remove unneeded comments from the media API DocBook files

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

vidioc-enumoutput.xml

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

2011-12-11 09:16:53 -02: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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

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

vidioc-g-dv-timings.xml

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

2011-07-27 17:53:35 -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] V4L2 Spec: fix extended control documentation

2012-01-16 09:37:53 -02: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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

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

vidioc-g-frequency.xml

[media] v4l2-ioctl: make tuner 'type' check more strict for S_FREQUENCY

2012-01-16 09:58:53 -02: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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -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] doc: v4l: add documentation for selection API

2012-01-10 23:18:23 -02:00

vidioc-g-sliced-vbi-cap.xml

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

2011-07-27 17:53:35 -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] Remove unneeded comments from the media API DocBook files

2011-12-11 09:16:53 -02: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] V4L: document the new VIDIOC_CREATE_BUFS and VIDIOC_PREPARE_BUF ioctl()s

2011-11-03 18:28:27 -02: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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

2011-07-27 17:53:35 -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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

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

vidioc-queryctrl.xml

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

2011-12-11 09:16:53 -02: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] DocBook: Use the generic ioctl error codes for all V4L ioctl's

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

vidioc-s-hw-freq-seek.xml

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

2011-12-11 09:16:53 -02: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] DocBook: Move all media docbook stuff into its own directory

2011-07-27 17:52:05 -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-subscribe-event.xml

[media] v4l: events: Define V4L2_EVENT_FRAME_SYNC

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