Mercurial > mplayer.hg

changeset 8711:906f7a2dc085

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sig 11 fix in reinit and resample + spelling error fixes
author anders
date Thu, 02 Jan 2003 03:00:44 +0000
parents ba369c754b36
children 9e32c8ee5862
files libaf/af.c libaf/af_channels.c libaf/af_resample.c
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libaf/af.c	Thu Jan 02 01:38:35 2003 +0000
+++ b/libaf/af.c	Thu Jan 02 03:00:44 2003 +0000
@@ -287,7 +287,7 @@
     }
     // Check if there are any filters left in the list
     if(NULL == af){
-      if(!af_append(s,s->first,"dummy")) 
+      if(!(af=af_append(s,s->first,"dummy"))) 
 	return -1; 
     }
     else
--- a/libaf/af_channels.c	Thu Jan 02 01:38:35 2003 +0000
+++ b/libaf/af_channels.c	Thu Jan 02 03:00:44 2003 +0000
@@ -20,7 +20,7 @@
 }af_channels_t;
 
 // Local function for copying data
-void copy(void* in, void* out, int ins, int inos,int outs, int outos, int len, int bps)
+static void copy(void* in, void* out, int ins, int inos,int outs, int outos, int len, int bps)
 {
   switch(bps){
   case 1:{
@@ -86,7 +86,7 @@
 {
   int i;
   if((s->nr < 1) || (s->nr > AF_NCH)){
-    af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs musst be" 
+    af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be" 
 	   " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
     return AF_ERROR;
   }
@@ -149,14 +149,14 @@
       int ch = 0;
       // Sanity check
       if((s->nr < 1) || (s->nr > AF_NCH)){
-	af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs musst be" 
+	af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be" 
 	     " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
       }	
       s->router = 1;
       // Scan for pairs on commandline
       while((*cp == ':') && (ch < s->nr)){
 	sscanf(cp, ":%i:%i%n" ,&s->route[ch][FR], &s->route[ch][TO], &n);
-	af_msg(AF_MSG_DEBUG0,"[channels] Routing from channel %i to" 
+	af_msg(AF_MSG_VERBOSE,"[channels] Routing from channel %i to" 
 	       " channel %i\n",s->route[ch][FR],s->route[ch][TO]);
 	cp = &cp[n];
 	ch++;
--- a/libaf/af_resample.c	Thu Jan 02 01:38:35 2003 +0000
+++ b/libaf/af_resample.c	Thu Jan 02 03:00:44 2003 +0000
@@ -132,7 +132,7 @@
     size_t 	   tsz = (s->type==TYPE_INT) ? sizeof(int16_t) : sizeof(float);
 
     // Make sure this filter isn't redundant 
-    if(af->data->rate == n->rate)
+    if((af->data->rate == n->rate) || (af->data->rate == 0))
       return AF_DETACH;
 
     // If linear interpolation