From 4fab6627697100ccc3135a13f4d0eb483cbe3227 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Wed, 2 Dec 2009 09:12:05 +0000 Subject: [PATCH] AAC: Add a global header but output not locked output configuration status. Originally committed as revision 20701 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac.c | 2 +- libavcodec/aac.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aac.c b/libavcodec/aac.c index ad5de7c5c7..6b2c4169d7 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -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))) 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; if (extension_flag) { diff --git a/libavcodec/aac.h b/libavcodec/aac.h index bcfa9c7ee5..3472a6163d 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -109,6 +109,7 @@ enum OCStatus { OC_NONE, //< Output unconfigured 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_GLOBAL_HDR, //< Output configuration set in a global header but not yet locked OC_LOCKED, //< Output configuration locked in place };