1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer 7d26be63c2 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>
2012-11-05 22:51:20 +01:00
..
2012-10-18 13:12:28 +01:00
2012-11-04 19:11:26 +00:00
2012-10-31 12:07:11 +01:00
2012-11-05 11:22:53 +00:00
2012-11-04 19:11:26 +00:00
2012-10-18 13:12:28 +01:00
2012-10-23 02:19:38 +02:00
2012-10-18 13:12:28 +01:00
2012-11-05 02:20:52 +01:00