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_film.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_film.c')
| -rw-r--r-- | src/demuxers/demux_film.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 399ae3f74..0fd986dbf 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.17 2002/07/10 02:54:43 tmmm Exp $ + * $Id: demux_film.c,v 1.18 2002/07/14 22:27:25 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -335,13 +335,11 @@ static void *demux_film_loop (void *this_gen) { while (remaining_sample_bytes) { buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); - buf->content = buf->mem; buf->type = this->video_type; buf->input_pos = this->sample_table[i].sample_offset; buf->input_length = this->data_end; buf->input_time = this->sample_table[i].pts / 90000; buf->pts = this->sample_table[i].pts; - buf->decoder_flags = 0; if (last_frame_pts) { buf->decoder_flags |= BUF_FLAG_FRAMERATE; @@ -402,13 +400,11 @@ static void *demux_film_loop (void *this_gen) { while (remaining_sample_bytes) { buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); - buf->content = buf->mem; buf->type = this->video_type; buf->input_pos = this->sample_table[i].sample_offset; buf->input_length = this->data_end; buf->input_time = this->sample_table[i].pts / 90000; buf->pts = this->sample_table[i].pts; - buf->decoder_flags = 0; if (remaining_sample_bytes > buf->max_size) buf->size = buf->max_size; @@ -436,13 +432,11 @@ static void *demux_film_loop (void *this_gen) { while (remaining_sample_bytes) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); - buf->content = buf->mem; buf->type = this->audio_type; buf->input_pos = this->sample_table[i].sample_offset; buf->input_length = this->data_end; buf->input_time = this->sample_table[i].pts / 90000; buf->pts = this->sample_table[i].pts; - buf->decoder_flags = 0; if (remaining_sample_bytes > buf->max_size) buf->size = buf->max_size; @@ -625,7 +619,6 @@ static int demux_film_start (demux_plugin_t *this_gen, /* send init info to decoders */ if (this->video_fifo && this->video_type) { 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 */ @@ -640,7 +633,6 @@ static int demux_film_start (demux_plugin_t *this_gen, if (this->audio_fifo && this->audio_type) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); - buf->content = buf->mem; buf->type = BUF_AUDIO_LPCM_BE; buf->decoder_flags = BUF_FLAG_HEADER; buf->decoder_info[0] = 0; |