Skip to content

V
vlc-2-2
Commit 1aa8f6ce authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Cleanup of AAC profile selection.

parent ba014d62
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
modules/codec/ffmpeg/encoder.c
View file @ 1aa8f6ce
...@@ -386,8 +386,10 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) ...@@ -386,8 +386,10 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
else if( !strncmp( val.psz_string, "ltp", 3 ) ) else if( !strncmp( val.psz_string, "ltp", 3 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_LTP; p_sys->i_aac_profile = FF_PROFILE_AAC_LTP;
else else
{
msg_Warn( p_enc, "unknown AAC profile requested" );
p_sys->i_aac_profile = FF_PROFILE_UNKNOWN; p_sys->i_aac_profile = FF_PROFILE_UNKNOWN;
msg_Info( p_enc, "AAC profile %s", val.psz_string ); }
} }
if( val.psz_string ) free( val.psz_string ); if( val.psz_string ) free( val.psz_string );
...@@ -556,8 +558,10 @@ msg_Info( p_enc, "AAC profile %s", val.psz_string ); ...@@ -556,8 +558,10 @@ msg_Info( p_enc, "AAC profile %s", val.psz_string );
p_context->sample_rate = p_enc->fmt_in.audio.i_rate; p_context->sample_rate = p_enc->fmt_in.audio.i_rate;
p_context->channels = p_enc->fmt_in.audio.i_channels; p_context->channels = p_enc->fmt_in.audio.i_channels;
if( p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '4', 'a') ) /* Ignore FF_PROFILE_UNKNOWN */
p_context->profile = p_sys->i_aac_profile; if( ( p_sys->i_aac_profile >= FF_PROFILE_AAC_MAIN ) &&
( p_enc->fmt_out.i_codec == VLC_FOURCC('m','p','4','a') ) )
p_context->profile = p_sys->i_aac_profile;
} }
/* Misc parameters */ /* Misc parameters */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment