[vlc-devel] commit: Revert " Special case for fourcc samr and sawb in transcode_audio_new()" ( Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Jun 22 18:51:56 2008 +0200| [b4a4b564cda53b03aebf818dd2db65709602c68b]

Revert "Special case for fourcc samr and sawb in transcode_audio_new()"
That commit broke audio sample rate changing.

This reverts commit ddac67aaf2bde4179f695bb26033488e8e7c35cc.

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

 modules/stream_out/transcode.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 4a345ae..67b41da 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -1152,11 +1152,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
                     id->p_decoder->fmt_out.i_codec );
     id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
 
-    if( ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','m','r') ) ||
-        ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','w','b') ) )
-         id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
-    else
-        id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
+    id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
     id->p_encoder->fmt_in.audio.i_physical_channels =
         id->p_encoder->fmt_out.audio.i_physical_channels;
     id->p_encoder->fmt_in.audio.i_original_channels =