Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
397a4949
Commit
397a4949
authored
Oct 28, 2008
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unneeded if for aac-profile
default aac-profile to low instead of main
parent
761d97ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
modules/codec/avcodec/avcodec.c
modules/codec/avcodec/avcodec.c
+1
-1
modules/codec/avcodec/encoder.c
modules/codec/avcodec/encoder.c
+4
-2
No files found.
modules/codec/avcodec/avcodec.c
View file @
397a4949
...
...
@@ -187,7 +187,7 @@ vlc_module_begin();
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
/* Audio AAC encoder profile */
add_string
(
ENC_CFG_PREFIX
"aac-profile"
,
"
main
"
,
NULL
,
add_string
(
ENC_CFG_PREFIX
"aac-profile"
,
"
low
"
,
NULL
,
ENC_PROFILE_TEXT
,
ENC_PROFILE_LONGTEXT
,
true
);
#endif
#endif
/* ENABLE_SOUT */
...
...
modules/codec/avcodec/encoder.c
View file @
397a4949
...
...
@@ -390,6 +390,8 @@ int OpenEncoder( vlc_object_t *p_this )
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
var_Get
(
p_enc
,
ENC_CFG_PREFIX
"aac-profile"
,
&
val
);
/* ffmpeg uses faac encoder atm, and it has issues with
* other than low-complexity profile, so default to that */
p_sys
->
i_aac_profile
=
FF_PROFILE_AAC_LOW
;
if
(
val
.
psz_string
&&
*
val
.
psz_string
)
{
...
...
@@ -594,8 +596,8 @@ int OpenEncoder( vlc_object_t *p_this )
* to the desired value (-R option of the faac frontend)
p_enc->fmt_in.audio.i_rate = p_context->sample_rate;*/
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
/* Ignore FF_PROFILE_UNKNOWN */
if
(
p_sys
->
i_aac_profile
>=
FF_PROFILE_AAC_MAIN
)
/* vlc should default to low-complexity profile, faac encoder
* has bug and aac audio has issues otherwise atm */
p_context
->
profile
=
p_sys
->
i_aac_profile
;
#endif
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment