From 9298d831bf8e3434714e3597e08df9323579700d Mon Sep 17 00:00:00 2001
From: Guenter Bartsch <guenter@users.sourceforge.net>
Date: Sun, 28 Apr 2002 16:11:12 +0000
Subject: last 0.9.9 preparations, disable ffmpeg debug output, error message
 fix for oss

CVS patchset: 1798
CVS date: 2002/04/28 16:11:12
---
 configure.in                      |  6 +++---
 src/audio_out/audio_oss_out.c     | 29 +++++++++++++++++++----------
 src/libffmpeg/libavcodec/common.h |  2 ++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/configure.in b/configure.in
index cbe04bd71..b72c66799 100644
--- a/configure.in
+++ b/configure.in
@@ -26,9 +26,9 @@ dnl
 XINE_MAJOR=0
 XINE_MINOR=9
 XINE_SUB=9
-XINE_PRE="cvs"
-XINE_IFACE_AGE=3
-XINE_BIN_AGE=3
+XINE_PRE=""
+XINE_IFACE_AGE=0
+XINE_BIN_AGE=0
 
 AC_SUBST(XINE_MAJOR)
 AC_SUBST(XINE_MINOR)
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index f8a9b573e..0e0eb3de5 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_oss_out.c,v 1.61 2002/04/28 15:20:38 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.62 2002/04/28 16:11:12 guenter Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -261,17 +261,26 @@ static int ao_oss_open(ao_driver_t *this_gen,
   case AO_CAP_MODE_5CHANNEL:
   case AO_CAP_MODE_5_1CHANNEL:
     if (bits==8)
-       tmp = AFMT_U8;
+      tmp = AFMT_U8;
     else
-       tmp = AFMT_S16_NE;
+      tmp = AFMT_S16_NE;
     if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0
-	|| tmp != AFMT_S16_NE) {
-      printf("audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_S16_NE.\n");
-      if (tmp != AFMT_S16_NE)
-	printf("audio_oss_out: ioctl succeeded but set format to %x.\n", tmp);
-      else
-	printf("audio_oss_out: The AFMT_S16_NE ioctl failed.\n");
-      return 0;
+	|| (tmp!=AFMT_S16_NE && tmp!=AFMT_U8)) {
+      if (bits==8) {
+	printf("audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_U8.\n");
+        if (tmp != AFMT_U8)
+          printf("audio_oss_out: ioctl succeeded but set format to 0x%x.\n",tmp);
+        else
+          printf("audio_oss_out: The AFMT_U8 ioctl failed.\n");
+        return 0;
+      } else {
+	printf("audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_S16_NE.\n");
+        if (tmp != AFMT_S16_NE)
+          printf("audio_oss_out: ioctl succeeded but set format to 0x%x.\n",tmp);
+        else
+          printf("audio_oss_out: The AFMT_S16_NE ioctl failed.\n");
+        return 0;
+      }          
     }
     break;
   case AO_CAP_MODE_A52:
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index 53e123d48..9c7b086d8 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -1,6 +1,8 @@
 #ifndef COMMON_H
 #define COMMON_H
 
+#undef DEBUG
+
 #define FFMPEG_VERSION_INT 0x000406
 #define FFMPEG_VERSION     "0.4.6"
 
-- 
cgit v1.2.3