From 981b8fd777f8ea273c53a055cbbb45ad9fe872aa Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 3 Nov 2009 22:50:02 +0000 Subject: Don't lock the channel output configuration based on the first value seen for non extradata formats. Instead lock it only after the successful decoding of a frame. This fixes issue 999. Originally committed as revision 20448 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'libavcodec/aac.h') diff --git a/libavcodec/aac.h b/libavcodec/aac.h index abe13268d5..bcfa9c7ee5 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -102,6 +102,16 @@ enum CouplingPoint { AFTER_IMDCT = 3, }; +/** + * Output configuration status + */ +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_LOCKED, //< Output configuration locked in place +}; + /** * Predictor State */ @@ -275,7 +285,7 @@ typedef struct { DECLARE_ALIGNED(16, float, temp[128]); - int output_configured; + enum OCStatus output_configured; } AACContext; #endif /* AVCODEC_AAC_H */ -- cgit v1.2.3