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/parseutils.h | |
| parent | e859339e7af52210c6fe84a8e6412f0c30d1c4da (diff) | |
| parent | 5ff998a233d759d0de83ea6f95c383d03d25d88e (diff) | |
| download | ffmpeg-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/parseutils.h')
0 files changed, 0 insertions, 0 deletions