diff options
| author | Antoine Jacquet <royale@zerezo.com> | 2008-08-18 23:18:18 +0200 |
|---|---|---|
| committer | Antoine Jacquet <royale@zerezo.com> | 2008-08-18 23:18:18 +0200 |
| commit | e04f4692fb946b6480f856cb4986bacdc3a25f67 (patch) | |
| tree | 569253cfb9f1e2e656af7e27ccde5d1fd4361f81 /linux/include | |
| parent | 907cb68cd937317d682455610490e10b06389d22 (diff) | |
| parent | a499d8eb7179d0990c06b89c3362af960c7d9eef (diff) | |
| download | mediapointer-dvb-s2-e04f4692fb946b6480f856cb4986bacdc3a25f67.tar.gz mediapointer-dvb-s2-e04f4692fb946b6480f856cb4986bacdc3a25f67.tar.bz2 | |
merge: v4l-dvb
From: Antoine Jacquet <royale@zerezo.com>
Priority: normal
Signed-off-by: Antoine Jacquet <royale@zerezo.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index cdb0e378a..f3ae9c88e 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -334,6 +334,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_SPCA508 v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */ #define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */ #define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */ +#define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ /* * F O R M A T E N U M E R A T I O N @@ -988,7 +989,8 @@ enum v4l2_mpeg_audio_crc { V4L2_MPEG_AUDIO_CRC_CRC16 = 1, }; #define V4L2_CID_MPEG_AUDIO_MUTE (V4L2_CID_MPEG_BASE+109) -#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+110) +#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE (V4L2_CID_MPEG_BASE+110) +#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE (V4L2_CID_MPEG_BASE+111) enum v4l2_mpeg_audio_ac3_bitrate { V4L2_MPEG_AUDIO_AC3_BITRATE_32K = 0, V4L2_MPEG_AUDIO_AC3_BITRATE_40K = 1, |