[vlc-commits] dca: do not override output format (refs #5150)

Rémi Denis-Courmont git at videolan.org
Wed Aug 3 17:06:46 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug  3 16:45:34 2011 +0300| [c54022a6cba1279225918c620eb618855ed82b8a] | committer: Rémi Denis-Courmont

dca: do not override output format (refs #5150)

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

 modules/audio_filter/converter/dtstofloat32.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 928b5ba..50de2b2 100644
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -326,17 +326,9 @@ static int OpenFilter( vlc_object_t *p_this )
     filter_sys_t *p_sys;
     int i_ret;
 
-    if( p_filter->fmt_in.i_codec != VLC_CODEC_DTS ||
-        p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFB ||
-        p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFL )
-    {
+    if( p_filter->fmt_in.i_codec != VLC_CODEC_DTS
+     || p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
         return VLC_EGENERIC;
-    }
-
-    p_filter->fmt_out.audio.i_format =
-        p_filter->fmt_out.i_codec = VLC_CODEC_FL32;
-    p_filter->fmt_out.audio.i_bitspersample =
-        aout_BitsPerSample( p_filter->fmt_out.i_codec );
 
     /* Allocate the memory needed to store the module's structure */
     p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );



More information about the vlc-commits mailing list