# HG changeset patch
# User alexc
# Date 1259745125 0
# Node ID 2474aceea736e7fa6a535058f930b0236ee086a0
# Parent  62b3faabb6631e945caa0974f3796e0d5a858614
AAC: Add a global header but output not locked output configuration status.

diff -r 62b3faabb663 -r 2474aceea736 aac.c
--- a/aac.c	Wed Dec 02 09:07:32 2009 +0000
+++ b/aac.c	Wed Dec 02 09:12:05 2009 +0000
@@ -390,7 +390,7 @@
         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 -r 62b3faabb663 -r 2474aceea736 aac.h
--- a/aac.h	Wed Dec 02 09:07:32 2009 +0000
+++ b/aac.h	Wed Dec 02 09:12:05 2009 +0000
@@ -109,6 +109,7 @@
     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
 };