diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-07 03:40:34 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-07 03:40:34 +0000 |
| commit | 7a901686f18c37b2cd885bd324916d47b34e7c5a (patch) | |
| tree | 471f3f5e6919d82dc3c848fe1ab50db2625285b6 /src/libac3/decode.c | |
| parent | 2866aa5a2be3ef68979648fe550a208bd65416ae (diff) | |
| download | xine-lib-7a901686f18c37b2cd885bd324916d47b34e7c5a.tar.gz xine-lib-7a901686f18c37b2cd885bd324916d47b34e7c5a.tar.bz2 | |
Fixed the way to detect libtool version. Add get_capabilities(),get_property()
and set_property() to audio out. get_supported_modes removed, use
get_cap() instead. Change the way of capabilities, match like video_out
AO_CAP_* and AO_PROP_*. Fixed a small typo in demux_mpeg.c. Fixed
libmpg123 audio output callings arguments. Change the AO_MODE to AO_CAP_MODE
in all required locations.
CVS patchset: 69
CVS date: 2001/05/07 03:40:34
Diffstat (limited to 'src/libac3/decode.c')
| -rw-r--r-- | src/libac3/decode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libac3/decode.c b/src/libac3/decode.c index 3239c5543..96ee6c1a3 100644 --- a/src/libac3/decode.c +++ b/src/libac3/decode.c @@ -137,7 +137,7 @@ static uint32_t decode_buffer_syncframe (syncinfo_t *syncinfo, uint8_t **start, //if we got to this point, we found a valid ac3 frame to decode // - if ((ac3_config.flags & AO_MODE_AC3) == 0) { + if ((ac3_config.flags & AO_CAP_MODE_AC3) == 0) { bitstream_init (buffer); //get rid of the syncinfo struct as we already parsed it bitstream_get (24); @@ -213,7 +213,7 @@ size_t ac3_decode_data (uint8_t *data_start, uint8_t *data_end, uint32_t pts_) goto error; #endif - if ((ac3_config.flags & AO_MODE_AC3) == 0) { + if ((ac3_config.flags & AO_CAP_MODE_AC3) == 0) { parse_bsi (&bsi); // compute downmix parameters @@ -286,11 +286,11 @@ size_t ac3_decode_data (uint8_t *data_start, uint8_t *data_end, uint32_t pts_) if (!is_output_initialized) { ac3_output->open (ac3_output, 16, syncinfo.sampling_rate, - (ac3_config.flags & AO_MODE_AC3) ? AO_MODE_AC3 : AO_MODE_STEREO); + (ac3_config.flags & AO_CAP_MODE_AC3) ? AO_CAP_MODE_AC3 : AO_CAP_MODE_STEREO); is_output_initialized = 1; } - if ((ac3_config.flags & AO_MODE_AC3) == 0) { + if ((ac3_config.flags & AO_CAP_MODE_AC3) == 0) { ac3_output->write_audio_data(ac3_output, s16_samples, 256*6, pts_); } |