From c0641405dec6fb244e7d3104035f64f6e535731c Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Fri, 9 Jan 2004 01:26:32 +0000 Subject: - 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 --- src/demuxers/demux_smjpeg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/demuxers/demux_smjpeg.c') diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 3734e18d0..3e40576d4 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -23,7 +23,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.47 2003/11/26 23:44:09 f1rmb Exp $ + * $Id: demux_smjpeg.c,v 1.48 2004/01/09 01:26:33 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -331,7 +331,7 @@ static void demux_smjpeg_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] = 3000; /* initial video_step */ memcpy(buf->content, &this->bih, sizeof(this->bih)); @@ -342,7 +342,7 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) { if (this->audio_fifo && this->audio_type) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); buf->type = this->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->audio_sample_rate; buf->decoder_info[2] = this->audio_bits; -- cgit v1.2.3