diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-27 01:18:54 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-27 01:18:54 +0400 |
| commit | 094a4968188b0129d674c1369bad45a86cd0d46d (patch) | |
| tree | 372eb9e7a5dc4222b7db34c5e10ae578b536ed9b /libavcodec/aacps_tablegen.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_tablegen.h')
| -rw-r--r-- | libavcodec/aacps_tablegen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h index c7e062bdb7..79ae644a87 100644 --- a/libavcodec/aacps_tablegen.h +++ b/libavcodec/aacps_tablegen.h @@ -139,7 +139,7 @@ static void ps_tableinit(void) } for (iid = 0; iid < 46; iid++) { - float c = iid_par_dequant[iid]; //<Linear Inter-channel Intensity Difference + float c = iid_par_dequant[iid]; ///< Linear Inter-channel Intensity Difference float c1 = (float)M_SQRT2 / sqrtf(1.0f + c*c); float c2 = c * c1; for (icc = 0; icc < 8; icc++) { |