[xiph-cvs] cvs commit: ices/src reencode.c

[Brendan]

brendan     03/03/13 14:32:22

  Modified:    src      reencode.c
  Log:
  Whoops, lame_decode_exit wasn't introduced until lame 3.93. Removed pending
  autoconf glue.

Revision  Changes    Path
1.19      +5 -15     ices/src/reencode.c

Index: reencode.c
===================================================================
RCS file: /cvs/ice/ices/src/reencode.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- reencode.c	13 Mar 2003 19:29:24 -0000	1.18
+++ reencode.c	13 Mar 2003 19:32:22 -0000	1.19
@@ -48,6 +48,11 @@
   if (! ices_config.reencode)
     return;
 
+  if (lame_decode_init () < 0) {
+    ices_log ("LAME: error initialising decoder");
+    ices_setup_shutdown ();
+  }
+
   ices_log_debug ("Using LAME version %s\n", get_lame_version ());
 }
 
@@ -58,21 +63,6 @@
 {
   ices_stream_t* stream;
   lame_global_flags* lame;
-  static int decoder_init = 0;
-
-  if (decoder_init) {
-    if (lame_decode_exit () < 0) {
-      ices_log ("LAME: error resetting decoder");
-      ices_setup_shutdown ();
-    }
-    decoder_init = 0;
-  }
-
-  if (lame_decode_init () < 0) {
-    ices_log ("LAME: error initialising decoder");
-    ices_setup_shutdown ();
-  }
-  decoder_init = 1;
 
   for (stream = ices_config.streams; stream; stream = stream->next) {
     if (! stream->reencode)

<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.