diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-17 18:48:07 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-12-17 18:48:07 +0000 |
| commit | 926093783c7367a23291063bcafc199aee2b12eb (patch) | |
| tree | 4165a6c04853d315293b39be646acef485684cc1 /src/demuxers/demux_vmd.c | |
| parent | 44a9e76d27c08c715df5c79f2ad3308eeadef205 (diff) | |
| parent | 8bd8e600bf475426cbcd5b8f8f89fb2d6e53ec29 (diff) | |
| download | xine-lib-926093783c7367a23291063bcafc199aee2b12eb.tar.gz xine-lib-926093783c7367a23291063bcafc199aee2b12eb.tar.bz2 | |
Merge from 1.2 main.
Diffstat (limited to 'src/demuxers/demux_vmd.c')
| -rw-r--r-- | src/demuxers/demux_vmd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index cbd413b4a..bcea5e725 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -19,7 +19,7 @@ */ /* - * Sierra Video and Music Data (.vmd) File Demuxer + * Sierra Video and Music Data (.vmd) File Demuxer * by Mike Melanson (melanson@pcisys.net) * For more information on the VMD file format, visit: * http://www.pcisys.net/~melanson/codecs/ @@ -109,7 +109,7 @@ static int open_vmd_file(demux_vmd_t *this) { unsigned int total_frames; int64_t current_video_pts = 0; - if (_x_demux_read_header(this->input, vmd_header, VMD_HEADER_SIZE) != + if (_x_demux_read_header(this->input, vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE) return 0; @@ -234,7 +234,7 @@ static int demux_vmd_send_chunk(demux_plugin_t *this_gen) { buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_VIDEO_VMD; if( this->data_size ) - buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * + buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 65535 / this->data_size); memcpy(buf->content, frame->frame_record, BYTES_PER_FRAME_RECORD); buf->size = BYTES_PER_FRAME_RECORD; @@ -246,7 +246,7 @@ static int demux_vmd_send_chunk(demux_plugin_t *this_gen) { buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_VIDEO_VMD; if( this->data_size ) - buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * + buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 65535 / this->data_size); if (remaining_bytes > buf->max_size) @@ -277,7 +277,7 @@ static int demux_vmd_send_chunk(demux_plugin_t *this_gen) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); buf->type = BUF_AUDIO_VMD; if( this->data_size ) - buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * + buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 65535 / this->data_size); memcpy(buf->content, frame->frame_record, BYTES_PER_FRAME_RECORD); buf->size = BYTES_PER_FRAME_RECORD; @@ -289,7 +289,7 @@ static int demux_vmd_send_chunk(demux_plugin_t *this_gen) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); buf->type = BUF_AUDIO_VMD; if( this->data_size ) - buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * + buf->extra_info->input_normpos = (int)( (double) (frame->frame_offset - this->data_start) * 65535 / this->data_size); if (remaining_bytes > buf->max_size) |