[xiph-cvs] cvs commit: speex/src speexenc.c

[Jean-Marc Valin]

jm          03/02/05 01:03:35

  Modified:    .        configure.in
               libspeex misc.h
               src      speexenc.c
  Log:
  version change

Revision  Changes    Path
1.43      +2 -2      speex/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/speex/configure.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- configure.in	28 Jan 2003 08:15:46 -0000	1.42
+++ configure.in	5 Feb 2003 06:03:35 -0000	1.43
@@ -4,8 +4,8 @@
 
 SPEEX_MAJOR_VERSION=0
 SPEEX_MINOR_VERSION=99
-SPEEX_MICRO_VERSION=6
-SPEEX_VERSION=1.0rc2
+SPEEX_MICRO_VERSION=7
+SPEEX_VERSION=1.0rc3
 SPEEX_BINARY_AGE=0
 SPEEX_INTERFACE_AGE=0
 

<p><p>1.17      +1 -1      speex/libspeex/misc.h

Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/misc.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- misc.h	31 Jan 2003 01:42:53 -0000	1.16
+++ misc.h	5 Feb 2003 06:03:35 -0000	1.17
@@ -36,7 +36,7 @@
 #define MISC_H
 
 #ifndef VERSION
-#define VERSION "speex-1.0rc2"
+#define VERSION "speex-1.0rc3"
 #endif
 
 /*Disable some warnings on VC++*/

<p><p>1.72      +2 -2      speex/src/speexenc.c

Index: speexenc.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexenc.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- speexenc.c	28 Jan 2003 08:48:07 -0000	1.71
+++ speexenc.c	5 Feb 2003 06:03:35 -0000	1.72
@@ -262,7 +262,7 @@
    int close_in=0, close_out=0;
    int eos=0;
    int bitrate=0;
-   int cumul_bits=0, enc_frames=0;
+   double cumul_bits=0, enc_frames=0;
    char first_bytes[12];
    int wave_input=0;
    comment_init(&comments, &comments_length, vendor_string);
@@ -647,7 +647,7 @@
          speex_encoder_ctl(st, SPEEX_GET_BITRATE, &tmp);
          fputc (ch, stderr);
          cumul_bits += tmp;
-         enc_frames++;
+         enc_frames += 1;
          if (vad_enabled || vbr_enabled || abr_enabled)
             fprintf (stderr, "Bitrate is use: %d bps  (average %d bps)   ", tmp, cumul_bits/enc_frames);
          else

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.