Commit 1cccba5c authored by Gildas Bazin's avatar Gildas Bazin

* modules/codec/araw.c: added "mlaw" as a fourcc for ulaw audio.
parent 28694bd9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* araw.c: Pseudo audio decoder; for raw pcm data * araw.c: Pseudo audio decoder; for raw pcm data
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2003 VideoLAN * Copyright (C) 2001, 2003 VideoLAN
* $Id: araw.c,v 1.26 2003/12/16 16:51:10 gbazin Exp $ * $Id: araw.c,v 1.27 2003/12/20 16:11:11 gbazin Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -164,6 +164,7 @@ static int DecoderOpen( vlc_object_t *p_this ) ...@@ -164,6 +164,7 @@ static int DecoderOpen( vlc_object_t *p_this )
case VLC_FOURCC('a','l','a','w'): case VLC_FOURCC('a','l','a','w'):
case VLC_FOURCC('u','l','a','w'): case VLC_FOURCC('u','l','a','w'):
case VLC_FOURCC('m','l','a','w'):
break; break;
default: default:
...@@ -283,7 +284,8 @@ static int DecoderOpen( vlc_object_t *p_this ) ...@@ -283,7 +284,8 @@ static int DecoderOpen( vlc_object_t *p_this )
p_sys->p_logtos16 = alawtos16; p_sys->p_logtos16 = alawtos16;
p_dec->fmt_in.audio.i_bitspersample = 8; p_dec->fmt_in.audio.i_bitspersample = 8;
} }
else if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'u', 'l', 'a', 'w' ) ) else if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'u', 'l', 'a', 'w' ) ||
p_dec->fmt_in.i_codec == VLC_FOURCC( 'm', 'l', 'a', 'w' ) )
{ {
p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
p_sys->p_logtos16 = ulawtos16; p_sys->p_logtos16 = ulawtos16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment