apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-12-24 11:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

Browse Source 
* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-21 13:29:03 +02:00
parent 05f228b0a0 d15c21e5fa
commit dcbff35199
12 changed files with 126 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/celp_math.c
View File

@@ -75,7 +75,7 @@ static const uint16_t tab_log2[33] =
#endif
};
int ff_log2(uint32_t value)
int ff_log2_q15(uint32_t value)
{
uint8_t power_int;
uint8_t frac_x0;