[vlc-commits] Use VLC_CODEC_S24(B|L)32

Rémi Denis-Courmont git at videolan.org
Thu Dec 20 19:20:59 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec 20 20:20:25 2012 +0200| [062e7e5732735ab5a9c90b7fad6a5639e064f2de] | committer: Rémi Denis-Courmont

Use VLC_CODEC_S24(B|L)32

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=062e7e5732735ab5a9c90b7fad6a5639e064f2de
---

 modules/access/alsa.c  |    4 ++--
 modules/access/pulse.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/access/alsa.c b/modules/access/alsa.c
index 07a0940..40f3d03 100644
--- a/modules/access/alsa.c
+++ b/modules/access/alsa.c
@@ -257,8 +257,8 @@ static const vlc_fourcc_t formats[] = {
     [SND_PCM_FORMAT_S16_BE]             = VLC_CODEC_S16B,
     [SND_PCM_FORMAT_U16_LE]             = VLC_CODEC_U16L,
     [SND_PCM_FORMAT_U16_BE]             = VLC_CODEC_U16B,
-  //[SND_PCM_FORMAT_S24_LE]             = VLC_CODEC_?,
-  //[SND_PCM_FORMAT_S24_BE]             = VLC_CODEC_?,
+    [SND_PCM_FORMAT_S24_LE]             = VLC_CODEC_S24L32,
+    [SND_PCM_FORMAT_S24_BE]             = VLC_CODEC_S24B32,
     [SND_PCM_FORMAT_U24_LE]             = VLC_CODEC_U32L, // TODO: replay gain
     [SND_PCM_FORMAT_U24_BE]             = VLC_CODEC_U32B, // ^
     [SND_PCM_FORMAT_S32_LE]             = VLC_CODEC_S32L,
diff --git a/modules/access/pulse.c b/modules/access/pulse.c
index d8cf037..77e44c8 100644
--- a/modules/access/pulse.c
+++ b/modules/access/pulse.c
@@ -248,8 +248,8 @@ static const vlc_fourcc_t fourccs[] = {
     [PA_SAMPLE_S32BE] =     VLC_CODEC_S32B,
     [PA_SAMPLE_S24LE] =     VLC_CODEC_S24L,
     [PA_SAMPLE_S24BE] =     VLC_CODEC_S24B,
-    [PA_SAMPLE_S24_32LE] =  0,
-    [PA_SAMPLE_S24_32BE] =  0,
+    [PA_SAMPLE_S24_32LE] =  VLC_CODEC_S24L32,
+    [PA_SAMPLE_S24_32BE] =  VLC_CODEC_S24B32,
 };
 
 static int Open(vlc_object_t *obj)



More information about the vlc-commits mailing list