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_4xm.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_4xm.c')
| -rw-r--r-- | src/demuxers/demux_4xm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index c936d1065..fe96e944a 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -23,7 +23,7 @@ * For more information on the 4xm file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_4xm.c,v 1.12 2003/11/26 19:43:27 f1rmb Exp $ + * $Id: demux_4xm.c,v 1.13 2004/01/09 01:26:32 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -402,7 +402,7 @@ static void demux_fourxm_send_headers(demux_plugin_t *this_gen) { /* send init info to decoders */ 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[0] = 0; buf->decoder_info[1] = this->video_pts_inc; /* initial video_step */ memcpy(buf->content, &this->bih, sizeof(this->bih)); @@ -413,7 +413,7 @@ static void demux_fourxm_send_headers(demux_plugin_t *this_gen) { if (this->audio_fifo && this->track_count > 0) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); buf->type = this->tracks[0].audio_type; - 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->tracks[0].sample_rate; buf->decoder_info[2] = this->tracks[0].bits; |