diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
| commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
| tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /src/pulsecore/sndfile-util.c | |
| parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
| parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'src/pulsecore/sndfile-util.c')
| -rw-r--r-- | src/pulsecore/sndfile-util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c index 032aefca..4f7f8bdb 100644 --- a/src/pulsecore/sndfile-util.c +++ b/src/pulsecore/sndfile-util.c @@ -113,7 +113,7 @@ int pa_sndfile_write_sample_spec(SF_INFO *sfi, pa_sample_spec *ss) { break; case PA_SAMPLE_S32LE: - case PA_SAMPLE_S32RE: + case PA_SAMPLE_S32BE: ss->format = PA_SAMPLE_S32NE; sfi->format |= SF_FORMAT_PCM_32; break; |