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/aacps.h | |
| parent | 0a1cf6621067c4a85b519c8cad5c345c29017f89 (diff) | |
| parent | 1717ba0cdd587fe3463c1d8560f2c7e13fb21ba3 (diff) | |
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/aacps.h')
| -rw-r--r-- | libavcodec/aacps.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h index 5fc211a986..757a44366b 100644 --- a/libavcodec/aacps.h +++ b/libavcodec/aacps.h @@ -52,11 +52,11 @@ typedef struct { int num_env; int enable_ipdopd; int border_position[PS_MAX_NUM_ENV+1]; - int8_t iid_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-channel Intensity Difference Parameters - int8_t icc_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-Channel Coherence Parameters + int8_t iid_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-channel Intensity Difference Parameters + int8_t icc_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-Channel Coherence Parameters /* ipd/opd is iid/icc sized so that the same functions can handle both */ - int8_t ipd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Inter-channel Phase Difference Parameters - int8_t opd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; //<Overall Phase Difference Parameters + int8_t ipd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Inter-channel Phase Difference Parameters + int8_t opd_par[PS_MAX_NUM_ENV][PS_MAX_NR_IIDICC]; ///< Overall Phase Difference Parameters int is34bands; int is34bands_old; |