← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to include/uapi/linux/v4l2-controls.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/uapi/linux/v4l2-controls.h
160
160
 * of controls. Total of 16 controls is reserved for this driver */
161
161
#define V4L2_CID_USER_SI476X_BASE               (V4L2_CID_USER_BASE + 0x1040)
162
162
 
 
163
/* The base for the TI VPE driver controls. Total of 16 controls is reserved for
 
164
 * this driver */
 
165
#define V4L2_CID_USER_TI_VPE_BASE               (V4L2_CID_USER_BASE + 0x1050)
 
166
 
163
167
/* MPEG-class control IDs */
164
168
/* The MPEG controls are applicable to all codec controls
165
169
 * and the 'MPEG' part of the define is historical */