diff aac.h @ 10491:74e51b86b934 libavcodec

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.

--- a/aac.h	Tue Nov 03 16:17:21 2009 +0000
+++ b/aac.h	Tue Nov 03 22:50:02 2009 +0000
@@ -103,6 +103,16 @@
 };
 
 /**
+ * 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
  */
 typedef struct {
@@ -275,7 +285,7 @@
 
     DECLARE_ALIGNED(16, float, temp[128]);
 
-    int output_configured;
+    enum OCStatus output_configured;
 } AACContext;
 
 #endif /* AVCODEC_AAC_H */