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_vox.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_vox.c')
| -rw-r--r-- | src/demuxers/demux_vox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 8fb3cb61f..2d33952b4 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -87,7 +87,7 @@ static int demux_vox_send_chunk (demux_plugin_t *this_gen) { buf->size = buf->max_size; if( this->input->get_length (this->input) ) - buf->extra_info->input_normpos = (int)( (double) current_file_pos * + buf->extra_info->input_normpos = (int)( (double) current_file_pos * 65535 / this->input->get_length (this->input) ); buf->extra_info->input_time = audio_pts / 90; buf->pts = audio_pts; @@ -160,7 +160,7 @@ static int demux_vox_get_status (demux_plugin_t *this_gen) { static int demux_vox_get_stream_length (demux_plugin_t *this_gen) { demux_vox_t *this = (demux_vox_t *) this_gen; - return (int)((int64_t)this->input->get_length(this->input) + return (int)((int64_t)this->input->get_length(this->input) * 2 * 1000 / DIALOGIC_SAMPLERATE); } |