From 0f6d5e4fd967468f813daf359123b2047f9dc167 Mon Sep 17 00:00:00 2001
From: uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 8 Nov 2006 18:31:04 +0000
Subject: Change value used to indicate "unknown audio format" from 0 to -1. 0
 collided with a valid format value.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20787 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libaf/af.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libaf/af.c')

diff --git a/libaf/af.c b/libaf/af.c
index ba5d59da14..e76af0821e 100644
--- a/libaf/af.c
+++ b/libaf/af.c
@@ -443,7 +443,8 @@ int af_init(af_stream_t* s)
     }
     
     // Check output format fix if not OK
-    if(s->output.format && s->last->data->format != s->output.format){
+    if(s->output.format != AF_FORMAT_UNKNOWN &&
+		s->last->data->format != s->output.format){
       if(strcmp(s->last->info->name,"format"))
 	af = af_append(s,s->last,"format");
       else
@@ -460,7 +461,8 @@ int af_init(af_stream_t* s)
     if(AF_OK != af_reinit(s,s->first))
       return -1;
 
-    if (!s->output.format) s->output.format = s->last->data->format;
+    if (s->output.format == AF_FORMAT_UNKNOWN)
+	s->output.format = s->last->data->format;
     if (!s->output.nch) s->output.nch = s->last->data->nch;
     if (!s->output.rate) s->output.rate = s->last->data->rate;
     if((s->last->data->format != s->output.format) || 
-- 
cgit v1.2.3