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/demuxers/demux_avi.c | |
| 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/demuxers/demux_avi.c')
| -rw-r--r-- | src/demuxers/demux_avi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 873a49900..72f18ac02 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.185 2003/12/23 16:58:25 mroi Exp $ + * $Id: demux_avi.c,v 1.186 2004/01/09 01:26:32 miguelfreitas Exp $ * * demultiplexer for avi streams * @@ -1532,7 +1532,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { _x_demux_control_start (this->stream); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); - buf->decoder_flags = BUF_FLAG_HEADER; + buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END; buf->decoder_info[1] = this->video_step; memcpy (buf->content, this->avi->bih, this->avi->bih->biSize); buf->size = this->avi->bih->biSize; @@ -1562,7 +1562,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { /* send off the palette, if there is one */ if (this->avi->palette_count) { buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); - buf->decoder_flags = BUF_FLAG_SPECIAL; + buf->decoder_flags = BUF_FLAG_SPECIAL|BUF_FLAG_HEADER; buf->decoder_info[1] = BUF_SPECIAL_PALETTE; buf->decoder_info[2] = this->avi->palette_count; buf->decoder_info_ptr[2] = &this->avi->palette; @@ -1578,7 +1578,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); wavex_len = (a->wavex_len < buf->max_size) ? a->wavex_len : buf->max_size; - buf->decoder_flags = BUF_FLAG_HEADER; + buf->decoder_flags = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END; memcpy (buf->content, a->wavex, wavex_len); buf->size = wavex_len; buf->type = a->audio_type | i; |