From 180ace8c194d76ba780847ea5b4eb3e6adf5befb Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Sun, 8 Dec 2002 21:43:50 +0000 Subject: - get xine_demux_control_headers_done() out of the demuxers. i want to make sure we have a 1:1 mapping of sending and waiting for BUF_CONTROL_HEADERS_DONE.) - bring asf demuxer into a saner state when seeking. that fixes the problem of wrong audio pts and hanging audio_out on huge sleeps (at least for asf). CVS patchset: 3465 CVS date: 2002/12/08 21:43:50 --- src/demuxers/demux_smjpeg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/demuxers/demux_smjpeg.c') diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index fcda4a928..0cc9a46c1 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -21,7 +21,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.27 2002/11/28 10:21:07 petli Exp $ + * $Id: demux_smjpeg.c,v 1.28 2002/12/08 21:43:51 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -363,8 +363,6 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) { buf->decoder_info[3] = this->audio_channels; this->audio_fifo->put (this->audio_fifo, buf); } - - xine_demux_control_headers_done (this->stream); } static int demux_smjpeg_seek (demux_plugin_t *this_gen, -- cgit v1.2.3