~ubuntu-branches/ubuntu/precise/alsa-driver/precise

« back to all changes in this revision

Viewing changes to alsa-kernel/core/pcm_misc.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2011-02-21 18:06:40 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20110221180640-a8p2yxtvgf7xbxub
Tags: 1.0.24+dfsg-0ubuntu1
* New upstream release
* Refreshed patches:
  - distinguish_kernel_makefile_and_source_dirs.patch
  - debian_dfsg_configure.patch
* debian/control: Update Vcs-bzr field to point to new branch location

Show diffs side-by-side

added added

removed removed

Lines of Context:
128
128
                .width = 4, .phys = 4, .le = -1, .signd = -1,
129
129
                .silence = {},
130
130
        },
 
131
        [SNDRV_PCM_FORMAT_G723_24] = {
 
132
                .width = 3, .phys = 3, .le = -1, .signd = -1,
 
133
                .silence = {},
 
134
        },
 
135
        [SNDRV_PCM_FORMAT_G723_40] = {
 
136
                .width = 5, .phys = 5, .le = -1, .signd = -1,
 
137
                .silence = {},
 
138
        },
131
139
        /* FIXME: the following three formats are not defined properly yet */
132
140
        [SNDRV_PCM_FORMAT_MPEG] = {
133
141
                .le = -1, .signd = -1,
186
194
                .width = 18, .phys = 24, .le = 0, .signd = 0,
187
195
                .silence = { 0x02, 0x00, 0x00 },
188
196
        },
 
197
        [SNDRV_PCM_FORMAT_G723_24_1B] = {
 
198
                .width = 3, .phys = 8, .le = -1, .signd = -1,
 
199
                .silence = {},
 
200
        },
 
201
        [SNDRV_PCM_FORMAT_G723_40_1B] = {
 
202
                .width = 5, .phys = 8, .le = -1, .signd = -1,
 
203
                .silence = {},
 
204
        },
189
205
};
190
206
 
191
207