diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:51:20 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 22:51:20 +0100 |
commit | 7d26be63c25e715f008e8923654bdf318419dd39 (patch) | |
tree | c3d598d06854085a7e9f9474dee81e543f069cdb /libavutil/intmath.c | |
parent | e859339e7af52210c6fe84a8e6412f0c30d1c4da (diff) | |
parent | 5ff998a233d759d0de83ea6f95c383d03d25d88e (diff) | |
download | ffmpeg-streaming-7d26be63c25e715f008e8923654bdf318419dd39.zip ffmpeg-streaming-7d26be63c25e715f008e8923654bdf318419dd39.tar.gz |
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
flacenc: use uint64_t for bit counts
flacenc: remove wasted trailing 0 bits
lavu: add av_ctz() for trailing zero bit count
flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
fate: aac: Place LATM tests and general AAC tests in different groups
build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/intmath.c')
-rw-r--r-- | libavutil/intmath.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/libavutil/intmath.c b/libavutil/intmath.c new file mode 100644 index 0000000..1f725c7 --- /dev/null +++ b/libavutil/intmath.c @@ -0,0 +1,39 @@ +/* + * 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); +} + +int av_ctz(int v) +{ + return ff_ctz(v); +} |