Changeset b4a4b564cda53b03aebf818dd2db65709602c68b

Show
Ignore:
Timestamp:
06/22/08 19:20:45 (3 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1214155245 +0200
git-parent:

[ffd957bd3130b792a11fc0422b9908ff5b46bf59]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1214153516 +0200
Message:

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

This reverts commit ddac67aaf2bde4179f695bb26033488e8e7c35cc.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/stream_out/transcode.c

    rf991c02 rb4a4b56  
    11531153    id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec; 
    11541154 
    1155     if( ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','m','r') ) || 
    1156         ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','w','b') ) ) 
    1157          id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate; 
    1158     else 
    1159         id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate; 
     1155    id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate; 
    11601156    id->p_encoder->fmt_in.audio.i_physical_channels = 
    11611157        id->p_encoder->fmt_out.audio.i_physical_channels;