summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-10 16:24:16 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-10 16:24:16 +0000
commit5fd17a2c073abc2c674e81cdca761f390a5a4e08 (patch)
tree224910141beb9c54a535e6e4f764ef6d5708a396 /libmpdemux
parent48938efe63933b07c0ca54b81296f54088370709 (diff)
downloadmpv-5fd17a2c073abc2c674e81cdca761f390a5a4e08.tar.bz2
mpv-5fd17a2c073abc2c674e81cdca761f390a5a4e08.tar.xz
Calculate length of ASF files with more than 1 second precision.
Based on patch by On2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29881 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/asf.h2
-rw-r--r--libmpdemux/asfheader.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index a1e29a942f..a3d2b01c17 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -222,7 +222,7 @@ struct asf_priv {
int scrambling_b;
unsigned packetsize;
double packetrate;
- unsigned movielength;
+ double movielength;
int asf_is_dvr_ms;
uint32_t asf_frame_state;
int asf_frame_start_found;
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index d54cadb442..7e87739338 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -544,7 +544,7 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
asf->packetsize=fileh->max_packet_size;
asf->packet=malloc(asf->packetsize); // !!!
asf->packetrate=fileh->max_bitrate/8.0/(double)asf->packetsize;
- asf->movielength=(fileh->play_duration-10000*fileh->preroll)/10000000LL;
+ asf->movielength=(fileh->play_duration-10000*fileh->preroll)/10000000.0;
}
// find content header