diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-14 22:27:24 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-14 22:27:24 +0000 |
| commit | 775c694abe5e84d66e448864c0281bf569bf509c (patch) | |
| tree | 8829d985ba94742b6877b3cf375aef3257c361da /src/demuxers/demux_smjpeg.c | |
| parent | 43926fa28a72a0593f97b9e5718172ce26f27612 (diff) | |
| download | xine-lib-775c694abe5e84d66e448864c0281bf569bf509c.tar.gz xine-lib-775c694abe5e84d66e448864c0281bf569bf509c.tar.bz2 | |
make demuxers a bit more "programmer friendly"
CVS patchset: 2265
CVS date: 2002/07/14 22:27:24
Diffstat (limited to 'src/demuxers/demux_smjpeg.c')
| -rw-r--r-- | src/demuxers/demux_smjpeg.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index fa26f663e..6a55c935f 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.2 2002/07/10 06:28:19 pmhahn Exp $ + * $Id: demux_smjpeg.c,v 1.3 2002/07/14 22:27:25 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -164,12 +164,10 @@ static void *demux_smjpeg_loop (void *this_gen) { buf->type = this->video_type; } - buf->content = buf->mem; buf->input_pos = current_file_pos; buf->input_length = this->input_length; buf->input_time = pts / 90000; buf->pts = pts; - buf->decoder_flags = 0; if (remaining_sample_bytes > buf->max_size) buf->size = buf->max_size; @@ -424,7 +422,6 @@ this->video_type = BUF_VIDEO_JPEG; /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); - buf->content = buf->mem; buf->decoder_flags = BUF_FLAG_HEADER; buf->decoder_info[0] = 0; buf->decoder_info[1] = 3000; /* initial video_step */ @@ -435,7 +432,6 @@ this->video_type = BUF_VIDEO_JPEG; if (this->audio_fifo && this->audio_type) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); - buf->content = buf->mem; buf->type = this->audio_type; buf->decoder_flags = BUF_FLAG_HEADER; buf->decoder_info[0] = 0; |