[vlc-commits] WAV: simplification

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan  7 02:02:06 2013 +0100| [f2b3b0f4e1deeaeb66c128941e96e35b850092ac] | committer: Jean-Baptiste Kempf

WAV: simplification

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

 modules/demux/wav.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 7867c87..0a07349 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -318,6 +318,9 @@ static int Open( vlc_object_t * p_this )
             goto error;
         break;
     case VLC_CODEC_ADPCM_MS:
+    /* FIXME not sure at all FIXME */
+    case VLC_FOURCC( 'm', 's', 0x00, 0x61 ):
+    case VLC_FOURCC( 'm', 's', 0x00, 0x62 ):
         if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
                                 &p_sys->fmt ) )
             goto error;
@@ -327,13 +330,6 @@ static int Open( vlc_object_t * p_this )
                                  &p_sys->fmt ) )
             goto error;
         break;
-    case VLC_FOURCC( 'm', 's', 0x00, 0x61 ):
-    case VLC_FOURCC( 'm', 's', 0x00, 0x62 ):
-        /* FIXME not sure at all FIXME */
-        if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
-                                &p_sys->fmt ) )
-            goto error;
-        break;
     case VLC_CODEC_MPGA:
     case VLC_CODEC_A52:
         /* FIXME set end of area FIXME */