diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-14 08:01:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-14 08:01:03 -0300 |
| commit | 77a54391749b0582d1b897410f89f29a97d65c0e (patch) | |
| tree | c90f69a1d41a47472e2d865e427d739b1fb272b0 /linux/include | |
| parent | 7fd7d21d543d90ecf1086f9c5909bd4c01cf69ae (diff) | |
| parent | ae60401740721009d74b54741f77637b64907bdc (diff) | |
| download | mediapointer-dvb-s2-77a54391749b0582d1b897410f89f29a97d65c0e.tar.gz mediapointer-dvb-s2-77a54391749b0582d1b897410f89f29a97d65c0e.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index cdb0e378a..9e699d0b8 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -988,7 +988,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, |