* correction de l'affichage des fps (affichage, pas calcul).

 * changements mineurs dans les fichiers Debian.

diff --git a/ChangeLog b/ChangeLog
index 99de734d37a7a119531440d31e68ca3cc2f7741c..fbc0b67ccf6d7888436e1b67ff6d9e8a06b80649 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-  * fixe a 100% cpu usage bug, in the dummy aout
-  * Added a 'f' shortcut to switch between Windowed and Fullscreened
+0.1.99j:
+
+  * Minor changes in the Debian files.
+  * Fixed fps display.
+  * Fixed MPEG1 video decoding.
+  * Fixed a 100% cpu usage bug, in the dummy aout.
+  * Added a 'f' shortcut to switch between Windowed and Fullscreen
     mode.
 
 Mon, 28 Aug 2000 02:34:18 +0200
-O.1.99i :
+0.1.99i :
 
   * fixed the support for field pictures, which involved a few dozens
     bugs in the video parser and video decoder.

diff --git a/debian/changelog b/debian/changelog
index a4215d62f570e74e830531a5ae8d189ed7146a8c..e1860de923ba477822c777c66a9d9b3ee2ffc46d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (0.1.99i) unstable; urgency=low
+
+  * Fixed the framerate display
+
+ -- Samuel Hocevar <sam@zoy.org>  Tue, 24 Oct 2000 11:08:01 +0200
+
 vlc (0.1.99i) unstable; urgency=low
 
   * fixed the support for field pictures, which involved a few dozens

diff --git a/debian/control b/debian/control
index 55e830fb7b2a70899697e155c7da91dec30a4543..7911694a298b74444686bc8fd54400b967353789 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: vlc
 Section: graphics
 Priority: optional
-Maintainer: Samuel Hocevar <sam@via.ecp.fr>
+Maintainer: Samuel Hocevar <sam@zoy.org>
 Standards-Version: 3.0.1
 
 Package: vlc

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index d9d667fbadbada81315de6eb8bf191aecdc9a10b..a4eff4fcdd0a9cd0d2fbf5b6190d40050c48befb 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1692,9 +1692,12 @@ static void RenderPictureInfo( vout_thread_t *p_vout, picture_t *p_pic )
      */
     if( p_vout->c_fps_samples > VOUT_FPS_SAMPLES )
     {
-        sprintf( psz_buffer, "%lli/10 fps", VOUT_FPS_SAMPLES * 1000000 * 10 /
-                 ( p_vout->p_fps_sample[ (p_vout->c_fps_samples - 1) % VOUT_FPS_SAMPLES ] -
-                   p_vout->p_fps_sample[ p_vout->c_fps_samples % VOUT_FPS_SAMPLES ] ) );
+        long i_fps = VOUT_FPS_SAMPLES * 1000000 * 10 /
+                           ( p_vout->p_fps_sample[ (p_vout->c_fps_samples - 1)
+                                                   % VOUT_FPS_SAMPLES ] -
+                             p_vout->p_fps_sample[ p_vout->c_fps_samples
+                                                   % VOUT_FPS_SAMPLES ] );
+        sprintf( psz_buffer, "%li.%i fps", i_fps / 10, (int)i_fps % 10 );
         Print( p_vout, 0, 0, RIGHT_RALIGN, TOP_RALIGN, psz_buffer );
     }
 

diff --git a/vlc.spec b/vlc.spec
index 016b7186e68ba2263301540f6a106ec1e265df0d..ceece950073652a34e02fb4a95fbf1af24ce53ae 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -5,7 +5,7 @@ Copyright: GPL
 Url: http://www.videolan.org/
 Group: X11/Applications/Graphics
 Source0: http://www.videolan.org/packages/0.1.99i/vlc-0.1.99i.tar.gz
-Packager: Samuel Hocevar <sam@via.ecp.fr>
+Packager: Samuel Hocevar <sam@zoy.org>
 
 Buildroot: /tmp/vlc-build
 Summary: VideoLAN Client.