From 2c3a941579dc38fdd4d7fe3397e6dbb13d5c080f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 4 Jul 2012 22:24:25 +0300
Subject: [PATCH] aout: drop FI32 from outputs
---
modules/audio_output/alsa.c | 4 ----
modules/audio_output/file.c | 3 +--
modules/audio_output/pulse.c | 4 ----
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index df1ce604b3f2..7ca6abbfcc5d 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -195,10 +195,6 @@ static int Open (vlc_object_t *obj)
case VLC_CODEC_F32L:
pcm_format = SND_PCM_FORMAT_FLOAT_LE;
break;
- case VLC_CODEC_FI32:
- fourcc = VLC_CODEC_FL32;
- pcm_format = SND_PCM_FORMAT_FLOAT;
- break;
case VLC_CODEC_S32B:
pcm_format = SND_PCM_FORMAT_S32_BE;
break;
diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index b5ac856c10c0..cd1d502567b3 100644
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -88,7 +88,7 @@ static void Play ( audio_output_t *, block_t * );
"header to the file.")
static const char *const format_list[] = { "u8", "s8", "u16", "s16", "u16_le",
- "s16_le", "u16_be", "s16_be", "fixed32",
+ "s16_le", "u16_be", "s16_be",
"float32", "spdif" };
static const int format_int[] = { VLC_CODEC_U8,
VLC_CODEC_S8,
@@ -97,7 +97,6 @@ static const int format_int[] = { VLC_CODEC_U8,
VLC_CODEC_S16L,
VLC_CODEC_U16B,
VLC_CODEC_S16B,
- VLC_CODEC_FI32,
VLC_CODEC_FL32,
VLC_CODEC_SPDIFL };
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index c8e7c0878ace..32c15b7d89fb 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -705,10 +705,6 @@ static int Open(vlc_object_t *obj)
case VLC_CODEC_F32L:
ss.format = PA_SAMPLE_FLOAT32LE;
break;
- case VLC_CODEC_FI32:
- format = VLC_CODEC_FL32;
- ss.format = PA_SAMPLE_FLOAT32NE;
- break;
case VLC_CODEC_S32B:
ss.format = PA_SAMPLE_S32BE;
break;
--
GitLab