diff options
| author | ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-26 23:03:53 +0000 |
|---|---|---|
| committer | ivo <ivo@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-26 23:03:53 +0000 |
| commit | 01191a83924516d7fe1212f707c73d3b401d4b5a (patch) | |
| tree | 98e1f7ec80e8a76f841ef23f4573b717edf43ab6 /libao2 | |
| parent | 15bb88b70667eab1730609e02b26079059b62b40 (diff) | |
| download | mpv-01191a83924516d7fe1212f707c73d3b401d4b5a.tar.bz2 mpv-01191a83924516d7fe1212f707c73d3b401d4b5a.tar.xz | |
Have OSS audio out fall back to s16ne instead of u8 if it can't open the
soundcard for 3+ channels and do it for all audio streams (not only AC3).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14835 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_oss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index ce5d81c78b..121aa009ea 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -289,8 +289,9 @@ ac3_retry: format=AF_FORMAT_S16_NE; } if( ioctl(audio_fd, SNDCTL_DSP_SETFMT, &oss_format)<0 || - oss_format != format2oss(format)) if(format == AF_FORMAT_AC3){ - mp_msg(MSGT_AO,MSGL_WARN, MSGTR_AO_OSS_CantSetAC3, dsp); + oss_format != format2oss(format)) { + mp_msg(MSGT_AO,MSGL_WARN, MSGTR_AO_OSS_CantSet, dsp, + af_fmt2str_short(format), af_fmt2str_short(AF_FORMAT_S16_NE) ); format=AF_FORMAT_S16_NE; goto ac3_retry; } |