Commit 074c63a4 authored by alexc's avatar alexc

AAC: Add a global header but output not locked output configuration status.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20701 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ab5305d1
...@@ -390,7 +390,7 @@ static int decode_ga_specific_config(AACContext *ac, GetBitContext *gb, ...@@ -390,7 +390,7 @@ static int decode_ga_specific_config(AACContext *ac, GetBitContext *gb,
if ((ret = set_default_channel_config(ac, new_che_pos, channel_config))) if ((ret = set_default_channel_config(ac, new_che_pos, channel_config)))
return ret; return ret;
} }
if ((ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config, OC_LOCKED))) if ((ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config, OC_GLOBAL_HDR)))
return ret; return ret;
if (extension_flag) { if (extension_flag) {
......
...@@ -109,6 +109,7 @@ enum OCStatus { ...@@ -109,6 +109,7 @@ enum OCStatus {
OC_NONE, //< Output unconfigured OC_NONE, //< Output unconfigured
OC_TRIAL_PCE, //< Output configuration under trial specified by an inband PCE OC_TRIAL_PCE, //< Output configuration under trial specified by an inband PCE
OC_TRIAL_FRAME, //< Output configuration under trial specified by a frame header OC_TRIAL_FRAME, //< Output configuration under trial specified by a frame header
OC_GLOBAL_HDR, //< Output configuration set in a global header but not yet locked
OC_LOCKED, //< Output configuration locked in place OC_LOCKED, //< Output configuration locked in place
}; };
......
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