diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-01-09 01:26:32 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-01-09 01:26:32 +0000 |
| commit | c0641405dec6fb244e7d3104035f64f6e535731c (patch) | |
| tree | ebde21ba846624ff2ed4e0682b0b31a6a4dd1c0d /src/libflac | |
| parent | d1c62ab2512fa23f7bf510396bf5bce28e05b5f9 (diff) | |
| download | xine-lib-c0641405dec6fb244e7d3104035f64f6e535731c.tar.gz xine-lib-c0641405dec6fb244e7d3104035f64f6e535731c.tar.bz2 | |
- rework semantics of some buffer flags. check buffer.h for details.
- increase demux and decoder apis
- fix runtime changing of ogg/ogm audio channels
note: i hope i haven't broken any demux->decoder data exchange. please report any problems.
CVS patchset: 6014
CVS date: 2004/01/09 01:26:32
Diffstat (limited to 'src/libflac')
| -rw-r--r-- | src/libflac/decoder_flac.c | 2 | ||||
| -rw-r--r-- | src/libflac/demux_flac.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libflac/decoder_flac.c b/src/libflac/decoder_flac.c index ce7d56c78..046559d7b 100644 --- a/src/libflac/decoder_flac.c +++ b/src/libflac/decoder_flac.c @@ -241,7 +241,7 @@ flac_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) /* We are getting the stream header, open up the audio * device, and collect information about the stream */ - if (buf->decoder_flags & BUF_FLAG_HEADER) + if (buf->decoder_flags & BUF_FLAG_STDHEADER) { int mode = AO_CAP_MODE_MONO; diff --git a/src/libflac/demux_flac.c b/src/libflac/demux_flac.c index 805a0fb76..30fc0315f 100644 --- a/src/libflac/demux_flac.c +++ b/src/libflac/demux_flac.c @@ -359,7 +359,7 @@ demux_flac_send_headers (demux_plugin_t *this_gen) { if (this->audio_fifo) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); buf->type = BUF_AUDIO_FLAC; - buf->decoder_flags = BUF_FLAG_HEADER; + buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END; buf->decoder_info[0] = 0; buf->decoder_info[1] = this->sample_rate; buf->decoder_info[2] = this->bits_per_sample; |