Revert [19071] because it is broken. It doesn't allow channel or samplerate...

Revert [19071] because it is broken. It doesn't allow channel or samplerate changes for fourcc mp4a even when explicitly requested by the user. Specify channels=2 and samplerate=NNNN for fourcc mp4a if you want AAC SBR.

modules/stream_out/transcode.c

@@ -1377,15 +1377,6 @@ static int transcode_audio_new( sout_stream_t *p_stream,
     id->p_encoder->fmt_in.audio.i_bitspersample =
         audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
 
-    /* Fix AAC SBR changing number of channels and sampling rate */
-    if( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') &&
-        fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate &&
-        fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
-    {
-      id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
-      id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
-    }
-
     /* Load conversion filters */
     if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
         fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )