diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-08 18:31:04 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-08 18:31:04 +0000 |
| commit | 0f6d5e4fd967468f813daf359123b2047f9dc167 (patch) | |
| tree | a12700d1d1863694b0789760ed8b43843c130c79 /libaf/af.c | |
| parent | d9a87e081ec260bcbd626ac990f2685a3b0fcbc2 (diff) | |
| download | mpv-0f6d5e4fd967468f813daf359123b2047f9dc167.tar.bz2 mpv-0f6d5e4fd967468f813daf359123b2047f9dc167.tar.xz | |
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
Diffstat (limited to 'libaf/af.c')
| -rw-r--r-- | libaf/af.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) || |