[MPlayer-cvslog] r37943 - trunk/libao2/ao_ivtv.c

al subversion at mplayerhq.hu
Wed Jun 21 00:59:39 EEST 2017


Author: al
Date: Wed Jun 21 00:59:38 2017
New Revision: 37943

Log:
ao_ivtv: Fix broken sample rate check

This was already fixed in ao_v4l2 by Reimar in r36739 .

Fixing it here too, though I doubt we have any ivtv users left.
We at least e.g. prevent this buggy condition from spreading
via copy and paste.

Patch from Michael McConville >mmcco mykolab com<

Modified:
   trunk/libao2/ao_ivtv.c

Modified: trunk/libao2/ao_ivtv.c
==============================================================================
--- trunk/libao2/ao_ivtv.c	Mon Jun 19 01:14:07 2017	(r37942)
+++ trunk/libao2/ao_ivtv.c	Wed Jun 21 00:59:38 2017	(r37943)
@@ -84,7 +84,7 @@ init (int rate, int channels, int format
   freq = rate;
 
   /* check for supported audio rate */
-  if (rate != 32000 || rate != 41000 || rate != 48000)
+  if (rate != 32000 && rate != 41000 && rate != 48000)
   {
     mp_msg (MSGT_AO, MSGL_ERR, MSGTR_AO_MPEGPES_UnsupSamplerate, rate);
     rate = 48000;


More information about the MPlayer-cvslog mailing list