Changeset 20d9ce55c3b28d288e044d05fb714691fc46da0c

Timestamp:

17/12/07 15:38:14 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1197902294 +0000

git-parent:

[ff8c208088b0f471c271a93230c4fa42fd39ac9e]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1197902294 +0000

Message:

Fix breakage in transcode_audio_new().

Files:

• modules/stream_out/transcode.c (modified) (3 diffs)

modules/stream_out/transcode.c

@@ -1354 +1354 @@
-    id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2');
-
-en
+de
-    id->p_encoder->fmt_in.audio.i_physical_channels =
-en
+de
-    id->p_encoder->fmt_in.audio.i_original_channels =
-en
+de
-    id->p_encoder->fmt_in.audio.i_channels =
-en
+de
-    id->p_encoder->fmt_in.audio.i_bitspersample =
-        audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
@@ -1379 +1379 @@
-
-    /* Fix AAC SBR changing number of channels and sampling rate */
-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_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;
@@ -2782 +2782 @@
-        }
-    }
-
-    return VLC_EGENERIC;
-}