mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-04 20:20:53 +00:00
dcbff35199
* 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>
35 lines
1021 B
C
35 lines
1021 B
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "intmath.h"
|
|
|
|
/* undef these to get the function prototypes from common.h */
|
|
#undef av_log2
|
|
#undef av_log2_16bit
|
|
#include "common.h"
|
|
|
|
int av_log2(unsigned v)
|
|
{
|
|
return ff_log2(v);
|
|
}
|
|
|
|
int av_log2_16bit(unsigned v)
|
|
{
|
|
return ff_log2_16bit(v);
|
|
}
|