diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 23:18:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 23:18:54 +0200 |
| commit | 094a4968188b0129d674c1369bad45a86cd0d46d (patch) | |
| tree | 372eb9e7a5dc4222b7db34c5e10ae578b536ed9b /libavcodec/aac.h | |
| parent | 0a1cf6621067c4a85b519c8cad5c345c29017f89 (diff) | |
| parent | 1717ba0cdd587fe3463c1d8560f2c7e13fb21ba3 (diff) | |
| download | ffmpeg-094a4968188b0129d674c1369bad45a86cd0d46d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fifo: add FIFO API test program, and fate test
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
postprocess.c: filter name needs to be double 0 terminated
doxygen: fix wrong comment syntax, //< vs. ///<
doxygen: drop pointless star from pointer variable names
Replace deprecated av_find_stream_info() by avformat_find_stream_info().
xmv: eliminate superfluous zeroing of zero data
configure: fix typo in avconv dependency list
Conflicts:
configure
doc/APIchanges
libavutil/Makefile
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 477acb5d4e..d01534de3f 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -104,11 +104,11 @@ 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_GLOBAL_HDR, //< Output configuration set in a global header but not yet locked - OC_LOCKED, //< Output configuration locked in place + 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 }; /** |