History

Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/adsp', 'asoc/topic/ak4613' and 'asoc/topic/atmel' into asoc-next

Mark Brown committed 10 years ago

Commit 8ebdab65 parents 1ab4f85 34015f5 95fe959 5547ba6 50860e120 files · +3073 −133Browse files

Showing the changes to include/uapi (1 of 20 files). Show all

Unified · Split

include/uapi/sound/compress_params.h+3−2
@@ -73,7 +73,8 @@ · 72 unmodified lines
73#define SND_AUDIOCODEC_IEC61937 ((__u32) 0x0000000B)73#define SND_AUDIOCODEC_IEC61937 ((__u32) 0x0000000B)
74#define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C)74#define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C)
75#define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D)75#define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D)
76#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_G72976#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)
77#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_BESPOKE
77 78
78/*79/*
79 * Profile and modes are listed with bit masks. This allows for a80 * Profile and modes are listed with bit masks. This allows for a
@@ -312,7 +313,7 @@ struct snd_enc_flac { · 232 unmodified lines
312 313
313struct snd_enc_generic {314struct snd_enc_generic {
314 __u32 bw; /* encoder bandwidth */315 __u32 bw; /* encoder bandwidth */
315 __s32 reserved[15];316 __s32 reserved[15]; /* Can be used for SND_AUDIOCODEC_BESPOKE */
316} __attribute__((packed, aligned(4)));317} __attribute__((packed, aligned(4)));
317 318
318union snd_codec_options {319union snd_codec_options {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t