Changeset 1aa8f6ce86c37dff7de914f6a2595f7a68db39a9

Show
Ignore:
Timestamp:
03/11/08 10:19:48 (5 months ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1205227188 +0100
git-parent:

[ba014d6298ecfac0bbce0ad934a69f7477b06148]

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

Cleanup of AAC profile selection.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/codec/ffmpeg/encoder.c

    rba014d6 r1aa8f6c  
    387387            p_sys->i_aac_profile = FF_PROFILE_AAC_LTP; 
    388388        else 
     389        { 
     390            msg_Warn( p_enc, "unknown AAC profile requested" ); 
    389391            p_sys->i_aac_profile = FF_PROFILE_UNKNOWN; 
    390 msg_Info( p_enc, "AAC profile %s", val.psz_string ); 
     392        } 
    391393    } 
    392394    if( val.psz_string ) free( val.psz_string ); 
    …… 
    557559        p_context->channels    = p_enc->fmt_in.audio.i_channels; 
    558560 
    559         if( p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '4', 'a') ) 
    560             p_context->profile     = p_sys->i_aac_profile; 
     561        /* Ignore FF_PROFILE_UNKNOWN */ 
     562        if( ( p_sys->i_aac_profile >= FF_PROFILE_AAC_MAIN ) &&  
     563            ( p_enc->fmt_out.i_codec == VLC_FOURCC('m','p','4','a') ) ) 
     564            p_context->profile = p_sys->i_aac_profile; 
    561565    } 
    562566