diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-11-03 22:50:02 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-11-03 22:50:02 +0000 |
| commit | 981b8fd777f8ea273c53a055cbbb45ad9fe872aa (patch) | |
| tree | 70543497270a7ee525c164cc08066aec3612c720 /libavcodec/aac.h | |
| parent | cabc41b0c25d6b714f1a5fadb6d0895f17d7a495 (diff) | |
| download | ffmpeg-981b8fd777f8ea273c53a055cbbb45ad9fe872aa.tar.gz | |
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
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index abe13268d5..bcfa9c7ee5 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -103,6 +103,16 @@ enum CouplingPoint { }; /** + * 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 @@ typedef struct { DECLARE_ALIGNED(16, float, temp[128]); - int output_configured; + enum OCStatus output_configured; } AACContext; #endif /* AVCODEC_AAC_H */ |