[FFmpeg-cvslog] Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  5 22:51:20 2012 +0100| [7d26be63c25e715f008e8923654bdf318419dd39] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d26be63c25e715f008e8923654bdf318419dd39
---