diff options
| author | Thibaut Mattern <tmattern@users.sourceforge.net> | 2006-03-07 08:03:08 +0000 |
|---|---|---|
| committer | Thibaut Mattern <tmattern@users.sourceforge.net> | 2006-03-07 08:03:08 +0000 |
| commit | 013d38071c3579a2006baf107b9f43cbef0bc569 (patch) | |
| tree | 67a1d3e9b18985e995f82f6b2138f5937052a49e /src/libffmpeg | |
| parent | fffa38ba786165e6c4f3c449ec29e3bdc6be0820 (diff) | |
| download | xine-lib-013d38071c3579a2006baf107b9f43cbef0bc569.tar.gz xine-lib-013d38071c3579a2006baf107b9f43cbef0bc569.tar.bz2 | |
Fixed channels to mode translation in audio decoders.
Patch from Chris Brien.
CVS patchset: 7922
CVS date: 2006/03/07 08:03:08
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/audio_decoder.c | 4 | ||||
| -rw-r--r-- | src/libffmpeg/dvaudio_decoder.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c index 38a152c0c..11efbbba7 100644 --- a/src/libffmpeg/audio_decoder.c +++ b/src/libffmpeg/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.22 2005/11/04 22:37:14 tmattern Exp $ + * $Id: audio_decoder.c,v 1.23 2006/03/07 08:03:08 tmattern Exp $ * * xine audio decoder plugin using ffmpeg * @@ -257,7 +257,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { this->output_open = this->stream->audio_out->open(this->stream->audio_out, this->stream, this->audio_bits, this->audio_sample_rate, - (this->audio_channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO); + _x_ao_channels2mode(this->audio_channels)); } /* if the audio still isn't open, bail */ diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c index 2ad4b6c5c..f88d049d2 100644 --- a/src/libffmpeg/dvaudio_decoder.c +++ b/src/libffmpeg/dvaudio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dvaudio_decoder.c,v 1.7 2005/08/25 15:36:30 valtri Exp $ + * $Id: dvaudio_decoder.c,v 1.8 2006/03/07 08:03:08 tmattern Exp $ * * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org> * @@ -289,7 +289,7 @@ static void dvaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { this->output_open = this->stream->audio_out->open(this->stream->audio_out, this->stream, this->audio_bits, this->audio_sample_rate, - (this->audio_channels == 2) ? AO_CAP_MODE_STEREO : AO_CAP_MODE_MONO); + _x_ao_channels2mode(this->audio_channels)); } /* if the audio still isn't open, bail */ |