Changeset ae95f6dc9820ba78ec5e158097427ac7baed1914

Show
Ignore:
Timestamp:
02/01/08 10:59:06 (1 year ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1199267946 +0000
git-parent:

[d83b49689ac6287782cc35b5bd7fe58513ffc7ca]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1199267946 +0000
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/stream_out/transcode.c

    rddac67a rae95f6d  
    13781378        audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); 
    13791379 
    1380     /* Fix AAC SBR changing number of channels and sampling rate */ 
    1381     if( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') && 
    1382         fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate && 
    1383         fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) 
    1384     { 
    1385       id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate; 
    1386       id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate; 
    1387     } 
    1388  
    13891380    /* Load conversion filters */ 
    13901381    if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||