changeset 844:80e7162bd968 trunk

[svn] - seek is implemented as it should be, but appears to not work
author nenolod
date Mon, 12 Mar 2007 18:53:58 -0700
parents 534375e63cc8
children 71c6cbf25348
files ChangeLog src/ffmpeg/TODO src/ffmpeg/ffmpeg.c
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 12 18:12:53 2007 -0700
+++ b/ChangeLog	Mon Mar 12 18:53:58 2007 -0700
@@ -1,3 +1,11 @@
+2007-03-13 01:12:53 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1786]
+  - this shouldn't be called "WMA Player"
+  
+  trunk/src/ffmpeg/ffmpeg.c |    9 ++++++---
+  1 file changed, 6 insertions(+), 3 deletions(-)
+
+
 2007-03-13 01:07:46 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1784]
   - remove some old wma leftovers
--- a/src/ffmpeg/TODO	Mon Mar 12 18:12:53 2007 -0700
+++ b/src/ffmpeg/TODO	Mon Mar 12 18:53:58 2007 -0700
@@ -4,3 +4,4 @@
 [X] synchronize wma sources with ffmpeg SVN
 [?] support for playing back the audio track from video files
 [i] remove video codecs, video demuxers
+[ ] seek does not work
--- a/src/ffmpeg/ffmpeg.c	Mon Mar 12 18:12:53 2007 -0700
+++ b/src/ffmpeg/ffmpeg.c	Mon Mar 12 18:53:58 2007 -0700
@@ -347,7 +347,7 @@
 
 	if(ffmpeg_seekpos != -1)
 	{
-	    av_seek_frame(ic, ffmpeg_idx, ffmpeg_seekpos * 1000000LL, AVSEEK_FLAG_BYTE);
+	    av_seek_frame(ic, ffmpeg_idx, ffmpeg_seekpos * AV_TIME_BASE, 0);
 	    playback->output->flush(ffmpeg_seekpos * 1000);
 	    ffmpeg_seekpos = -1;
 	}