[FFmpeg-cvslog] r20701 - in trunk/libavcodec: aac.c aac.h

[alexc]

Author: alexc
Date: Wed Dec  2 10:12:05 2009
New Revision: 20701

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

Modified:
   trunk/libavcodec/aac.c
   trunk/libavcodec/aac.h

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Wed Dec  2 10:07:32 2009	(r20700)
+++ trunk/libavcodec/aac.c	Wed Dec  2 10:12:05 2009	(r20701)
@@ -390,7 +390,7 @@ static int decode_ga_specific_config(AAC
         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) {

Modified: trunk/libavcodec/aac.h
==============================================================================
--- trunk/libavcodec/aac.h	Wed Dec  2 10:07:32 2009	(r20700)
+++ trunk/libavcodec/aac.h	Wed Dec  2 10:12:05 2009	(r20701)
@@ -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
 };