changeset 10622:2474aceea736 libavcodec

AAC: Add a global header but output not locked output configuration status.
author alexc
date Wed, 02 Dec 2009 09:12:05 +0000
parents 62b3faabb663
children f52d07b169b4
files aac.c aac.h
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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) {
--- 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
 };